diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-09-22 07:58:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 08:58:35 +0200 |
| commit | 5e918fa2738af7eaab3e2ffdfb007208a6d89294 (patch) | |
| tree | 26f2c933b295bc36938bb3e6fbf04258d14d63b4 /src/main/java/gtPlusPlus/core | |
| parent | 1925c00f24f04900d630129d9e337748fe3dc557 (diff) | |
| download | GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.tar.gz GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.tar.bz2 GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.zip | |
Some more RA2 conversions (#752)
* remove deprecated methods
* laser engraving
* fluid utils cleanup
* more deprecations
* biorecipes
* RA2 rocketfuel
* rare earth
* typo
* more rareearth cleanup
* nuclear fuel processing
* Update RecipeLoader_NuclearFuelProcessing.java
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
14 files changed, 339 insertions, 542 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 63e0bebe89..d6f8e5b972 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -703,9 +703,8 @@ public final class ModItems { temp1, null, true); - GT_Values.RA.stdBuilder().itemInputs(temp2).noItemOutputs().noFluidInputs() - .fluidOutputs(new FluidStack(fluidFertBasic, 36)).duration(5 * TICKS).eut(16) - .addTo(sFluidExtractionRecipes); + GT_Values.RA.stdBuilder().itemInputs(temp2).fluidOutputs(new FluidStack(fluidFertBasic, 36)) + .duration(5 * TICKS).eut(16).addTo(sFluidExtractionRecipes); } fluidFertUN32 = FluidUtils.generateFluidNonMolten( "UN32Fertiliser", diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 94a84ed27d..99fef5e19e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -55,7 +55,7 @@ public class BaseItemIngotHot extends BaseItemIngot { private void generateRecipe() { Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of " + this.materialName + "."); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(this)).itemOutputs(this.outputIngot.copy()) - .noFluidInputs().noFluidOutputs().duration(Math.max(this.componentMaterial.getMass() * 3L, 1L) * TICKS) + .duration(Math.max(this.componentMaterial.getMass() * 3L, 1L) * TICKS) .eut(this.componentMaterial.vVoltageMultiplier).addTo(sVacuumRecipes); } diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java index dcb9738fd4..3679121ed5 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java @@ -80,8 +80,8 @@ public class BaseItemIngot_OLD extends Item { if ((temp != null) && !temp.equals("")) { tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); if (tempOutput != null) { - GT_Values.RA.stdBuilder().itemInputs(tempStack).itemOutputs(tempOutput).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); + GT_Values.RA.stdBuilder().itemInputs(tempStack).itemOutputs(tempOutput).duration(15 * SECONDS) + .eut(2).addTo(sCompressorRecipes); } } } else if (this.unlocalName.contains("itemHotIngot")) { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 1da1fb6bfc..2dcb726171 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -467,13 +467,13 @@ public class AgriculturalChem extends ItemPackage { for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 5); GT_Values.RA.stdBuilder().itemInputs(aPeat, aMeat).itemOutputs(aOutputDust).fluidInputs(aInputFluid) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); } aPeat = ItemUtils.getSimpleStack(aPeatStack, 2); for (ItemStack aMeatStack : mList_Master_FruitVege) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 9); GT_Values.RA.stdBuilder().itemInputs(aPeat, aMeat).itemOutputs(aOutputDust).fluidInputs(aInputFluid) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); } } } @@ -488,13 +488,13 @@ public class AgriculturalChem extends ItemPackage { for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 7); GT_Values.RA.stdBuilder().itemInputs(aPeat, aMeat).itemOutputs(aOutputDust).fluidInputs(aInputFluid) - .noFluidOutputs().duration(10 * SECONDS).eut(140).addTo(UniversalChemical); + .duration(10 * SECONDS).eut(140).addTo(UniversalChemical); } aPeat = ItemUtils.getSimpleStack(aPeatStack, 3); for (ItemStack aMeatStack : mList_Master_FruitVege) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 12); GT_Values.RA.stdBuilder().itemInputs(aPeat, aMeat).itemOutputs(aOutputDust).fluidInputs(aInputFluid) - .noFluidOutputs().duration(5 * SECONDS).eut(140).addTo(UniversalChemical); + .duration(5 * SECONDS).eut(140).addTo(UniversalChemical); } } } @@ -556,8 +556,8 @@ public class AgriculturalChem extends ItemPackage { // Dirt Production GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(dustDirt, 9)) - .itemOutputs(ItemUtils.getSimpleStack(Blocks.dirt)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS).eut(8).addTo(sCompressorRecipes); + .itemOutputs(ItemUtils.getSimpleStack(Blocks.dirt)).duration(2 * SECONDS).eut(8) + .addTo(sCompressorRecipes); // Centrifuge Byproducts diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index ea4c664260..f37cb14ec5 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -447,7 +447,7 @@ public class GenericChem extends ItemPackage { .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L)).noFluidInputs() + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L)) .fluidOutputs(FluidUtils.getFluidStack(Carbon_Disulfide, 4000)).duration(10 * MINUTES) .eut(TierEU.RECIPE_LV).metadata(COIL_HEAT, 1500).addTo(sBlastRecipes); @@ -485,8 +485,7 @@ public class GenericChem extends ItemPackage { // Gas Fuels GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellNitrobenzene", 1)) - .noItemOutputs().noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 1600).metadata(FUEL_TYPE, 1) - .duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); + .metadata(FUEL_VALUE, 1600).metadata(FUEL_TYPE, 1).duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); } private void recipeGrindingBallAlumina() { @@ -495,7 +494,7 @@ public class GenericChem extends ItemPackage { ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64), GT_Utility.getIntegratedCircuit(10)) .itemOutputs(ItemUtils.getSimpleStack(mMillingBallAlumina, 8)) - .fluidInputs(FluidUtils.getFluidStack(GenericChem.Aniline, 4000)).noFluidOutputs().duration(3 * MINUTES) + .fluidInputs(FluidUtils.getFluidStack(GenericChem.Aniline, 4000)).duration(3 * MINUTES) .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); } @@ -505,8 +504,8 @@ public class GenericChem extends ItemPackage { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 32L), GT_Utility.getIntegratedCircuit(10)) .itemOutputs(ItemUtils.getSimpleStack(mMillingBallSoapstone, 8)) - .fluidInputs(FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500)).noFluidOutputs() - .duration(2 * MINUTES).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .fluidInputs(FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500)).duration(2 * MINUTES) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); } private void recipeCyclohexane() { @@ -554,8 +553,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L)) - .itemOutputs(ItemUtils.getSimpleStack(mRedCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mRedCatalyst, 10)).duration(20 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } private void recipeCatalystYellow() { @@ -566,8 +565,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L)) - .itemOutputs(ItemUtils.getSimpleStack(mYellowCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(1 * MINUTES).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mYellowCatalyst, 10)).duration(1 * MINUTES).eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); } private void recipeCatalystBlue() { @@ -578,8 +577,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L)) - .itemOutputs(ItemUtils.getSimpleStack(mBlueCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mBlueCatalyst, 10)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } private void recipeCatalystOrange() { @@ -590,8 +589,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L)) - .itemOutputs(ItemUtils.getSimpleStack(mOrangeCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mOrangeCatalyst, 10)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } private void recipeCatalystPurple() { @@ -602,8 +601,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L), ELEMENT.getInstance().RUTHENIUM.getDust(6)) - .itemOutputs(ItemUtils.getSimpleStack(mPurpleCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(2 * MINUTES).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mPurpleCatalyst, 10)).duration(2 * MINUTES).eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); } private void recipeCatalystBrown() { @@ -614,8 +613,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) - .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } private void recipeCatalystPink() { @@ -626,8 +625,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L), ELEMENT.getInstance().RHODIUM.getDust(4)) - .itemOutputs(ItemUtils.getSimpleStack(mFormaldehydeCatalyst, 4)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mFormaldehydeCatalyst, 4)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes); } private void recipeCatalystFormaldehyde() { @@ -637,8 +636,8 @@ public class GenericChem extends ItemPackage { getTierThreeChip(), CI.getEmptyCatalyst(4), ItemUtils.getSimpleStack(RocketFuels.Formaldehyde_Catalyst_Dust, 8)) - .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } private void recipeCatalystSolidAcid() { @@ -649,8 +648,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(5), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 5)) - .fluidInputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000)).noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .fluidInputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); } private void recipeCatalystInfiniteMutation() { @@ -661,8 +660,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(5), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L)) - .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); } private void recipeCadaverineAndPutrescine() { @@ -775,12 +774,6 @@ public class GenericChem extends ItemPackage { 240, 1); - /* - * CORE.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7), - * ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1), 20, - * FluidUtils.getFluidStack("fluid.cellhydrogenperoxide", 50), null, - * ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14), CI.emptyCells(1), 20*30, 240); - */ } private void recipeHydrogenPeroxide() { @@ -810,13 +803,6 @@ public class GenericChem extends ItemPackage { 240, 1); - /* - * CORE.RA.addChemicalRecipe( GT_ModHandler.getAirCell(15), - * ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5), 20, - * FluidUtils.getFluidStack("fluid.anthracene", 50), FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", - * 4450), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 2), CI.emptyCells(18), 20*30, 240); - */ - } private static final ItemStack getTierOneChip() { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java index 1a2bc6bd24..09838c6bac 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -94,7 +94,7 @@ public class NuclearChem extends ItemPackage { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2), GT_Utility.getIntegratedCircuit(20)) - .noItemOutputs().fluidInputs(FluidUtils.getMobEssence(5000)) + .fluidInputs(FluidUtils.getMobEssence(5000)) .fluidOutputs(FluidUtils.getFluidStack(GeneticMutagen, 8000)).duration(30 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index f5f18c84fa..d50a59b8e5 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -1,5 +1,10 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -12,7 +17,11 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.lib.CORE; @@ -61,37 +70,23 @@ public class RocketFuels extends ItemPackage { FluidStack fuelB = FluidUtils.getFluidStack("fuel", 3000); if (fuelA != null) { - // GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); - GT_Values.RA.addDistilleryRecipe( - CI.getNumberedCircuit(23), - fuelA, - FluidUtils.getFluidStack(Kerosene, 1800), - 200, - 64, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelA) + .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV / 2).addTo(sDistilleryRecipes); } if (fuelA == null && fuelB != null) { - // GT_Values.RA.addDistilleryRecipe(23, fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); - GT_Values.RA.addDistilleryRecipe( - CI.getNumberedCircuit(23), - fuelB, - FluidUtils.getFluidStack(Kerosene, 1800), - 200, - 64, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelB) + .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV / 2).addTo(sDistilleryRecipes); } } public static void createRP1() { FluidStack fuelA = FluidUtils.getFluidStack(Kerosene, 1000); if (fuelA != null) { - GT_Values.RA.addDistilleryRecipe( - CI.getNumberedCircuit(23), - fuelA, - FluidUtils.getFluidStack(RP1, 750), - 20 * 40, - 120, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelA) + .fluidOutputs(FluidUtils.getFluidStack(RP1, 750)).duration(40 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sDistilleryRecipes); } } @@ -139,10 +134,10 @@ public class RocketFuels extends ItemPackage { } private static void createLOH() { - GT_Values.RA.addVacuumFreezerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1), - 20 * 16); + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1)) + .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1)).duration(16 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + CORE.RA.addAdvancedFreezerRecipe( new ItemStack[] {}, new FluidStack[] { FluidUtils.getFluidStack("hydrogen", 300) }, @@ -195,16 +190,13 @@ public class RocketFuels extends ItemPackage { } private static void createFormaldehydeCatalyst() { - GT_Values.RA.addMixerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 16), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 1), - CI.getNumberedCircuit(18), - null, - null, - null, - ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4), - 160, - 30); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 16L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L), + GT_Utility.getIntegratedCircuit(18)) + .itemOutputs(ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4)).duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(sMixerRecipes); } private static void createUnsymmetricalDimethylhydrazine() { diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java index c829f49bfc..a4bf4fbd87 100644 --- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java +++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java @@ -10,7 +10,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils; public final class MISC_MATERIALS { /* - * Some of these materials purely exist as data objects, items will most likely be assigned seperately. Most are + * Some of these materials purely exist as data objects, items will most likely be assigned separately. Most are * just compositions which will have dusts assigned to them. */ @@ -314,12 +314,6 @@ public final class MISC_MATERIALS { 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(ELEMENT.getInstance().SODIUM, 1), - new MaterialStack(HYDROXIDE, 1)); - public static final Material SALT_WATER = new Material( "Salt Water", MaterialState.PURE_LIQUID, diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index 3cebd55e00..62fe3440ec 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -68,23 +68,16 @@ public class MaterialGenerator { @SuppressWarnings("unused") private static volatile Block tempBlock; + @Deprecated public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut) { return addFluidCannerRecipe(aEmpty, aFullContainer, aFluidIn, rFluidOut, null, null); } - /** - * Called Reflectively from CORE.RA.addFluidCannerRecipe - * - * @return - */ + @Deprecated public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut, Integer aTime, Integer aEu) { - /* - * GT_Recipe r = new Recipe_GT( true, new ItemStack[] {aEmpty}, new ItemStack[] {aFullContainer}, null, new - * int[] {}, new FluidStack[] {rFluidIn}, new FluidStack[] {rFluidOut}, 0, 0, 0); - */ - // new RecipeGen_FluidCanning(r, false); + RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0); if (g != null && g.valid()) { return true; diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index f21b20e2ff..4e6298caf4 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -128,8 +128,8 @@ public class RECIPES_GREGTECH { // Wood's Glass Laser Lens GT_Values.RA.stdBuilder().itemInputs(MISC_MATERIALS.WOODS_GLASS.getDust(5), ItemList.Shape_Mold_Ball.get(0)) - .itemOutputs(GregtechItemList.Laser_Lens_WoodsGlass.get(1)).noFluidInputs().noFluidOutputs() - .duration(5 * MINUTES).eut(TierEU.RECIPE_HV).addTo(sAlloySmelterRecipes); + .itemOutputs(GregtechItemList.Laser_Lens_WoodsGlass.get(1)).duration(5 * MINUTES).eut(TierEU.RECIPE_HV) + .addTo(sAlloySmelterRecipes); } private static void chemplantRecipes() { @@ -266,32 +266,32 @@ public class RECIPES_GREGTECH { } private static void fluidHeaterRecipes() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(20)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(20)) .fluidInputs(Materials.Water.getFluid(1000)).fluidOutputs(FluidUtils.getHotWater(1000)) .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(sFluidHeaterRecipes); } private static void vacuumFreezerRecipes() { GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Molten.get(1)) - .itemOutputs(GregtechItemList.Bomb_Cast_Set.get(1)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + .itemOutputs(GregtechItemList.Bomb_Cast_Set.get(1)).duration(30 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); } private static void latheRecipes() { GT_Values.RA.stdBuilder().itemInputs(ALLOY.EGLIN_STEEL.getBlock(1)) - .itemOutputs(GregtechItemList.Bomb_Cast_Mold.get(1)).noFluidInputs().noFluidOutputs() - .duration(15 * MINUTES).eut(TierEU.RECIPE_MV).addTo(sLatheRecipes); + .itemOutputs(GregtechItemList.Bomb_Cast_Mold.get(1)).duration(15 * MINUTES).eut(TierEU.RECIPE_MV) + .addTo(sLatheRecipes); GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Set.get(1)) .itemOutputs( GregtechItemList.Bomb_Cast_Broken.get(2), ItemUtils.getSimpleStack(ModItems.itemBombCasing, 2)) - .noFluidInputs().noFluidOutputs().duration(5 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sLatheRecipes); + .duration(5 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sLatheRecipes); } private static void fusionRecipes() { // Hypogen - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() + GT_Values.RA.stdBuilder() .fluidInputs( ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(144), ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288)) @@ -300,7 +300,7 @@ public class RECIPES_GREGTECH { .metadata(FUSION_THRESHOLD, 1_200_000_000).addTo(sFusionRecipes); // Rhugnor - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() + GT_Values.RA.stdBuilder() .fluidInputs( MaterialUtils.getMaterial("Infinity", "Neutronium").getMolten(144), ALLOY.QUANTUM.getFluidStack(288)) @@ -336,8 +336,8 @@ public class RECIPES_GREGTECH { ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8), ALLOY.TUMBAGA.getFluidStack(144 * 9 * 32), Materials.Nichrome.getMolten(16 * INGOTS)) - .noFluidOutputs().itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32)) - .eut(TierEU.RECIPE_LuV).duration(20 * MINUTES).addTo(AssemblyLine); + .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32)).eut(TierEU.RECIPE_LuV) + .duration(20 * MINUTES).addTo(AssemblyLine); // Turbine Automation Port GT_Values.RA.stdBuilder() @@ -362,7 +362,7 @@ public class RECIPES_GREGTECH { CI.getAlternativeTieredFluid(7, 144 * 16), CI.getTertiaryTieredFluid(7, 144 * 16), ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144)) - .noFluidOutputs().itemOutputs(GregtechItemList.Hatch_Input_TurbineHousing.get(4)).eut(TierEU.RECIPE_UV) + .itemOutputs(GregtechItemList.Hatch_Input_TurbineHousing.get(4)).eut(TierEU.RECIPE_UV) .duration(2 * HOURS).addTo(AssemblyLine); /* @@ -391,7 +391,7 @@ public class RECIPES_GREGTECH { CI.getTieredFluid(j, 144 * 8), CI.getTertiaryTieredFluid(j - 2, 144 * 16), CI.getAlternativeTieredFluid(j, 144 * 16)) - .noFluidOutputs().itemOutputs(aGemCasings[aCasingSlot++]).eut(GT_Values.V[j]).duration(2 * MINUTES) + .itemOutputs(aGemCasings[aCasingSlot++]).eut(GT_Values.V[j]).duration(2 * MINUTES) .addTo(AssemblyLine); } @@ -423,8 +423,8 @@ public class RECIPES_GREGTECH { CI.getTertiaryTieredFluid(j - 2, 144 * 2 * 16), CI.getAlternativeTieredFluid(j, 144 * 16), CI.getTertiaryTieredFluid(j - 1, 144 * 16)) - .noFluidOutputs().itemOutputs(aGemBatteries[aCasingSlot++]).eut(GT_Values.V[j]) - .duration(2 * MINUTES).addTo(AssemblyLine); + .itemOutputs(aGemBatteries[aCasingSlot++]).eut(GT_Values.V[j]).duration(2 * MINUTES) + .addTo(AssemblyLine); } if (Baubles.isModLoaded()) { @@ -446,7 +446,7 @@ public class RECIPES_GREGTECH { CI.getTertiaryTieredFluid(7, 144 * 18 * 16), CI.getAlternativeTieredFluid(6, 144 * 18 * 16), CI.getAlternativeTieredFluid(7, 144 * 18 * 16)) - .noFluidOutputs().itemOutputs(ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1)) + .itemOutputs(ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1)) .eut(TierEU.RECIPE_ZPM).duration(1 * HOURS).addTo(AssemblyLine); // Charge Pack LuV-UV @@ -481,8 +481,8 @@ public class RECIPES_GREGTECH { CI.getTertiaryTieredFluid(h - 1, 144 * 4 * 8), CI.getAlternativeTieredFluid(h - 1, 144 * 4 * 8), CI.getAlternativeTieredFluid(h - 2, 144 * 4 * 8)) - .noFluidOutputs().itemOutputs(aChargeOutputs[aCurrSlot]).eut(GT_Values.V[h]) - .duration((aCurrSlot + 1) * HOURS).addTo(AssemblyLine); + .itemOutputs(aChargeOutputs[aCurrSlot]).eut(GT_Values.V[h]).duration((aCurrSlot + 1) * HOURS) + .addTo(AssemblyLine); aCurrSlot++; } @@ -507,7 +507,6 @@ public class RECIPES_GREGTECH { CI.getTertiaryTieredFluid(8, 144 * 18 * 16), CI.getAlternativeTieredFluid(7, 144 * 18 * 16), CI.getAlternativeTieredFluid(8, 144 * 18 * 16)) - .noFluidOutputs() .itemOutputs(ItemUtils.getItemStackFromFQRN("miscutils:personalCloakingDevice-0.0", 1)) .eut(TierEU.RECIPE_UV).duration(1 * HOURS).addTo(AssemblyLine); } @@ -531,8 +530,8 @@ public class RECIPES_GREGTECH { ALLOY.PIKYONIUM.getFluidStack(144 * 8), ALLOY.INDALLOY_140.getFluidStack(144 * 9), Materials.SolderingAlloy.getMolten(144 * 10)) - .noFluidOutputs().itemOutputs(GregtechItemList.Mega_AlloyBlastSmelter.get(1L)) - .eut(TierEU.RECIPE_UHV / 2).duration(1 * MINUTES).addTo(AssemblyLine); + .itemOutputs(GregtechItemList.Mega_AlloyBlastSmelter.get(1L)).eut(TierEU.RECIPE_UHV / 2) + .duration(1 * MINUTES).addTo(AssemblyLine); } private static void laserEngraverRecipes() { @@ -546,81 +545,80 @@ public class RECIPES_GREGTECH { GregtechItemList.TransmissionComponent_MAX, }; for (int i = 0; i < 10; i++) { GT_Values.RA.stdBuilder().itemInputs(CI.getEmitter(i, 2), CI.getSensor(i, 2)) - .itemOutputs(aTransParts[i].get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(GT_Values.VP[i]).addTo(sLaserEngraverRecipes); + .itemOutputs(aTransParts[i].get(1)).duration(5 * SECONDS).eut(GT_Values.VP[i]) + .addTo(sLaserEngraverRecipes); } GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 6L), GregtechItemList.Laser_Lens_Special.get(0)) - .itemOutputs(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1)).noFluidInputs().noFluidOutputs() - .duration(3 * MINUTES).eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.vTier)) + .itemOutputs(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(1)).duration(3 * MINUTES) + .eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.vTier)) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 8L), GregtechItemList.Laser_Lens_Special.get(0)) - .itemOutputs(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(1)).noFluidInputs().noFluidOutputs() - .duration(2 * MINUTES).eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.ASTRAL_TITANIUM.vTier)) + .itemOutputs(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(1)).duration(2 * MINUTES) + .eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.ASTRAL_TITANIUM.vTier)) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder().itemInputs(ALLOY.NITINOL_60.getBlock(2), GregtechItemList.Laser_Lens_Special.get(0)) - .itemOutputs(ELEMENT.STANDALONE.ADVANCED_NITINOL.getBlock(1)).noFluidInputs().noFluidOutputs() - .duration(1 * MINUTES).eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.ADVANCED_NITINOL.vTier)) + .itemOutputs(ELEMENT.STANDALONE.ADVANCED_NITINOL.getBlock(1)).duration(1 * MINUTES) + .eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.ADVANCED_NITINOL.vTier)) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 64L), GregtechItemList.Laser_Lens_Special.get(0)) - .itemOutputs(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1)).noFluidInputs().noFluidOutputs() - .duration(5 * MINUTES).eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.vTier)) + .itemOutputs(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1)).duration(5 * MINUTES) + .eut(MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.vTier)) .addTo(sLaserEngraverRecipes); GT_Values.RA.stdBuilder().itemInputs(CI.getFieldGenerator(6, 1), CI.getEmitter(7, 2)) .itemOutputs(ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1)) - .noFluidInputs().noFluidOutputs().duration(5 * MINUTES).eut(TierEU.RECIPE_IV) - .addTo(sLaserEngraverRecipes); + .duration(5 * MINUTES).eut(TierEU.RECIPE_IV).addTo(sLaserEngraverRecipes); // Distillus Upgrade Chip GT_Values.RA.stdBuilder() .itemInputs( GregtechItemList.Laser_Lens_WoodsGlass.get(0), ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, 20, 1)) - .itemOutputs(GregtechItemList.Distillus_Upgrade_Chip.get(1)).noFluidInputs().noFluidOutputs() - .duration(5 * MINUTES).eut(TierEU.RECIPE_IV).addTo(sLaserEngraverRecipes); + .itemOutputs(GregtechItemList.Distillus_Upgrade_Chip.get(1)).duration(5 * MINUTES).eut(TierEU.RECIPE_IV) + .addTo(sLaserEngraverRecipes); } private static void breweryRecipes() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) .fluidInputs(EnchantingUtils.getMobEssence(100)).fluidOutputs(EnchantingUtils.getLiquidXP(1332)) .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(14)) .fluidInputs(EnchantingUtils.getLiquidXP(1332)).fluidOutputs(EnchantingUtils.getMobEssence(100)) .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sBrewingRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) - .noItemOutputs().fluidInputs(Materials.Water.getFluid(100L)) - .fluidOutputs(Materials.Biomass.getFluid(100L)).duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes); + .fluidInputs(Materials.Water.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L)) + .duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) - .noItemOutputs().fluidInputs(Materials.Honey.getFluid(100L)) - .fluidOutputs(Materials.Biomass.getFluid(100L)).duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes); + .fluidInputs(Materials.Honey.getFluid(100L)).fluidOutputs(Materials.Biomass.getFluid(100L)) + .duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest)) - .noItemOutputs().fluidInputs(FluidUtils.getFluidStack("juice", 100)) - .fluidOutputs(Materials.Biomass.getFluid(100L)).duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes); + .fluidInputs(FluidUtils.getFluidStack("juice", 100)).fluidOutputs(Materials.Biomass.getFluid(100L)) + .duration(1 * MINUTES).eut(3).addTo(sBrewingRecipes); } private static void cuttingSawRecipes() { GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1)) - .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 9)).noFluidInputs() - .noFluidOutputs().duration(16 * TICKS).eut(TierEU.RECIPE_ULV).addTo(sCutterRecipes); + .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 9)).duration(16 * TICKS) + .eut(TierEU.RECIPE_ULV).addTo(sCutterRecipes); } private static void electrolyzerRecipes() { - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1)).noItemOutputs() - .noFluidInputs().fluidOutputs(FluidUtils.getFluidStack("radon", 144)) - .duration(1 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1)) + .fluidOutputs(FluidUtils.getFluidStack("radon", 144)).duration(1 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_HV / 2).addTo(sElectrolyzerRecipes); } private static void extruderRecipes() { @@ -629,8 +627,8 @@ public class RECIPES_GREGTECH { .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("blockOsmium", 1), ItemList.Shape_Mold_Credit.get(0)) - .itemOutputs(ItemList.Credit_Greg_Osmium.get(1)).noFluidInputs().noFluidOutputs() - .duration(6 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_EV / 2).addTo(sExtruderRecipes); + .itemOutputs(ItemList.Credit_Greg_Osmium.get(1)).duration(6 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_EV / 2).addTo(sExtruderRecipes); } private static void blastSmelterRecipes() { @@ -799,19 +797,17 @@ public class RECIPES_GREGTECH { // Sulfuric Acid GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.glass_bottle)) .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion)) - .fluidInputs(Materials.SulfuricAcid.getFluid(250)).noFluidOutputs().duration(4).eut(1) - .addTo(sFluidCannerRecipes); + .fluidInputs(Materials.SulfuricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion)) - .itemOutputs(ItemUtils.getSimpleStack(Items.glass_bottle)).noFluidInputs() + .itemOutputs(ItemUtils.getSimpleStack(Items.glass_bottle)) .fluidOutputs(Materials.SulfuricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); // Hydrofluoric Acid GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.glass_bottle)) .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion)) - .fluidInputs(Materials.HydrofluoricAcid.getFluid(250)).noFluidOutputs().duration(4).eut(1) - .addTo(sFluidCannerRecipes); + .fluidInputs(Materials.HydrofluoricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion)) - .itemOutputs(ItemUtils.getSimpleStack(Items.glass_bottle)).noFluidInputs() + .itemOutputs(ItemUtils.getSimpleStack(Items.glass_bottle)) .fluidOutputs(Materials.HydrofluoricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); } @@ -918,16 +914,16 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Vanadium, 32L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.VanadiumSteel, 8L)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 4)) - .fluidInputs(Materials.Oxygen.getGas(8000L)).noFluidOutputs().duration(16 * SECONDS) - .eut(TierEU.RECIPE_MV / 2).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Oxygen.getGas(8000L)).duration(16 * SECONDS).eut(TierEU.RECIPE_MV / 2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VanadiumGallium, 8L)) .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 0, 4)) - .fluidInputs(Materials.Tantalum.getMolten(4 * INGOTS)).noFluidOutputs().duration(32 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Tantalum.getMolten(4 * INGOTS)).duration(32 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -936,7 +932,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 2L)) .itemOutputs(ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1)) - .fluidInputs(Materials.Oxygen.getGas(16 * BUCKETS)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) + .fluidInputs(Materials.Oxygen.getGas(16 * BUCKETS)).duration(3 * SECONDS + 4 * TICKS) .eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() @@ -946,8 +942,8 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_IV.get(1)) - .fluidInputs(Materials.Nitrogen.getGas(16 * BUCKETS)).noFluidOutputs().duration(6 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Nitrogen.getGas(16 * BUCKETS)).duration(6 * SECONDS).eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -956,7 +952,7 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_LuV.get(1)) - .fluidInputs(Materials.Helium.getGas(8 * BUCKETS)).noFluidOutputs().duration(12 * SECONDS + 10 * TICKS) + .fluidInputs(Materials.Helium.getGas(8 * BUCKETS)).duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() @@ -966,8 +962,8 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1)) - .fluidInputs(Materials.Argon.getGas(4 * BUCKETS)).noFluidOutputs().duration(25 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Argon.getGas(4 * BUCKETS)).duration(25 * SECONDS).eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -976,8 +972,8 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_UV.get(1)) - .fluidInputs(Materials.Radon.getGas(4 * BUCKETS)).noFluidOutputs().duration(50 * SECONDS) - .eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Radon.getGas(4 * BUCKETS)).duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -986,15 +982,15 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 2L)) .itemOutputs(GregtechItemList.Casing_Vanadium_Redox_MAX.get(1)) - .fluidInputs(FluidUtils.getFluidStack("krypton", 500)).noFluidOutputs() - .duration(1 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); + .fluidInputs(FluidUtils.getFluidStack("krypton", 500)).duration(1 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 32L), GregtechItemList.Bomb_Cast_Mold.get(0)) .itemOutputs(GregtechItemList.Bomb_Cast.get(4)).fluidInputs(Materials.Water.getFluid(4000L)) - .noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1002,16 +998,16 @@ public class RECIPES_GREGTECH { ItemUtils.getSimpleStack(CI.explosiveTNT, 4), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 2L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iron, 1L)) - .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive, 3)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV / 2).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockMiningExplosive, 3)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV / 2).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.BlackSteel, 8L)) - .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 64)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 64)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1021,8 +1017,8 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Brass, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Brass, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L)) - .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1032,8 +1028,8 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Invar, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Invar, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L)) - .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1)).noFluidInputs() - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1043,8 +1039,8 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Chrome, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Chrome, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L)) - .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1)).noFluidInputs() - .noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1054,36 +1050,36 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Titanium, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L)) - .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1)).noFluidInputs() - .noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1)).duration(40 * SECONDS) + .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1)).noFluidInputs() - .noFluidOutputs().duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1)) + .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1)).noFluidInputs() - .noFluidOutputs().duration(6 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1)).duration(6 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1)).noFluidInputs() - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1)).duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1)).noFluidInputs() - .noFluidOutputs().duration(1 * MINUTES + 36 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1)) + .duration(1 * MINUTES + 36 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); // Low tier Charge Packs @@ -1119,7 +1115,7 @@ public class RECIPES_GREGTECH { aPackCircuit[aAS], aPackBatteries[aAS], CI.getSensor(i, 4)) - .itemOutputs(aPackOutput[aAS]).fluidInputs(CI.getTieredFluid(i, (144 * 4))).noFluidOutputs() + .itemOutputs(aPackOutput[aAS]).fluidInputs(CI.getTieredFluid(i, (144 * 4))) .duration(30 * i * SECONDS).eut(GT_Values.V[i]).addTo(sAssemblerRecipes); } @@ -1136,8 +1132,8 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 12)) .itemOutputs( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1)) - .fluidInputs(CI.getAlternativeTieredFluid(7, 144 * 32)).noFluidOutputs().duration(5 * MINUTES) - .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .fluidInputs(CI.getAlternativeTieredFluid(7, 144 * 32)).duration(5 * MINUTES).eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); // Cloaking Device Research Page GT_Values.RA.stdBuilder() @@ -1148,18 +1144,18 @@ public class RECIPES_GREGTECH { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Palladium, 32L), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 12)) .itemOutputs(ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1)) - .fluidInputs(CI.getAlternativeTieredFluid(7, 144 * 32)).noFluidOutputs().duration(10 * MINUTES) + .fluidInputs(CI.getAlternativeTieredFluid(7, 144 * 32)).duration(10 * MINUTES) .eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); } } private static void distilleryRecipes() { Logger.INFO("Registering Distillery/Distillation Tower Recipes."); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) .fluidInputs(Materials.Air.getGas(1000L)).fluidOutputs(Materials.Helium.getGas(1L)) .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob, 1)) + GT_Values.RA.stdBuilder().itemOutputs(ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob, 1)) .fluidInputs(Materials.Air.getGas(20000L)).fluidOutputs(Materials.Helium.getGas(25L)) .duration(10 * SECONDS).eut(TierEU.RECIPE_MV / 2).addTo(sDistillationRecipes); @@ -1168,16 +1164,14 @@ public class RECIPES_GREGTECH { * so if you dissolve aparite in sulphuric acid you'll get a mixture of SO2, H2O, HF and HCl */ - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(FluidUtils.getFluidStack("sulfuricapatite", 5200)) + GT_Values.RA.stdBuilder().fluidInputs(FluidUtils.getFluidStack("sulfuricapatite", 5200)) .fluidOutputs( FluidUtils.getFluidStack("sulfurousacid", 3800), FluidUtils.getFluidStack("hydrogenchloride", 1000), FluidUtils.getFluidStack("hydrofluoricacid", 400)) .duration(45 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sDistillationRecipes); - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(FluidUtils.getFluidStack("sulfurousacid", 1000)) + GT_Values.RA.stdBuilder().fluidInputs(FluidUtils.getFluidStack("sulfurousacid", 1000)) .fluidOutputs(Materials.SulfurDioxide.getGas(500), Materials.Water.getFluid(500)).duration(10 * SECONDS) .eut(TierEU.RECIPE_MV / 2).addTo(sDistillationRecipes); } @@ -1217,13 +1211,12 @@ public class RECIPES_GREGTECH { ThermalFuel.addSteamTurbineFuel(FluidUtils.getFluidStack("steam", 1024)); - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.lava_bucket)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 32).metadata(FUEL_TYPE, 2).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getIC2Cell(2)).noItemOutputs().noFluidInputs().noFluidOutputs() - .metadata(FUEL_VALUE, 32).metadata(FUEL_TYPE, 2).duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getIC2Cell(11)).noItemOutputs().noFluidInputs().noFluidOutputs() - .metadata(FUEL_VALUE, 24).metadata(FUEL_TYPE, 2).duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.lava_bucket)).metadata(FUEL_VALUE, 32) + .metadata(FUEL_TYPE, 2).duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getIC2Cell(2)).metadata(FUEL_VALUE, 32).metadata(FUEL_TYPE, 2) + .duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getIC2Cell(11)).metadata(FUEL_VALUE, 24).metadata(FUEL_TYPE, 2) + .duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); } private static void extractorRecipes() { @@ -1242,18 +1235,18 @@ public class RECIPES_GREGTECH { private static void fluidExtractorRecipes() { // Gelid Cryotheum GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cryotheum, 1L)) - .noItemOutputs().noFluidInputs().fluidOutputs(FluidUtils.getFluidStack("cryotheum", 250)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sFluidExtractionRecipes); + .fluidOutputs(FluidUtils.getFluidStack("cryotheum", 250)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV / 2).addTo(sFluidExtractionRecipes); // Ender Fluid - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.ender_pearl)).noItemOutputs() - .noFluidInputs().fluidOutputs(FluidUtils.getFluidStack("ender", 250)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sFluidExtractionRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.ender_pearl)) + .fluidOutputs(FluidUtils.getFluidStack("ender", 250)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sFluidExtractionRecipes); // Blazing Pyrotheum GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Pyrotheum, 1L)) - .noItemOutputs().noFluidInputs().fluidOutputs(FluidUtils.getFluidStack("pyrotheum", 250)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sFluidExtractionRecipes); + .fluidOutputs(FluidUtils.getFluidStack("pyrotheum", 250)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV / 2).addTo(sFluidExtractionRecipes); } private static void centrifugeRecipes() { @@ -1264,7 +1257,7 @@ public class RECIPES_GREGTECH { MISC_MATERIALS.SODIUM_NITRATE.getDust(3), MISC_MATERIALS.POTASSIUM_NITRATE.getDust(2), CI.emptyCells(1)) - .noFluidInputs().noFluidOutputs().duration(6 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); + .duration(6 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); } private static void mixerRecipes() { @@ -1275,8 +1268,8 @@ public class RECIPES_GREGTECH { CI.emptyCells(1), MISC_MATERIALS.SODIUM_NITRATE.getDust(3), MISC_MATERIALS.POTASSIUM_NITRATE.getDust(2)) - .itemOutputs(MISC_MATERIALS.SOLAR_SALT_COLD.getCell(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + .itemOutputs(MISC_MATERIALS.SOLAR_SALT_COLD.getCell(1)).duration(2 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1286,7 +1279,7 @@ public class RECIPES_GREGTECH { Materials.Potassium.getDust(9), Materials.Lithium.getDust(9), Materials.Sulfur.getDust(9)) - .itemOutputs(ALLOY.LEAGRISIUM.getDust(50)).fluidInputs(Materials.Hydrogen.getGas(5000)).noFluidOutputs() + .itemOutputs(ALLOY.LEAGRISIUM.getDust(50)).fluidInputs(Materials.Hydrogen.getGas(5000)) .duration(1 * MINUTES).eut(TierEU.RECIPE_EV).addTo(sMixerRecipes); GT_Values.RA.stdBuilder() @@ -1297,8 +1290,8 @@ public class RECIPES_GREGTECH { Materials.Titanium.getDust(1), Materials.Nickel.getDust(4), Materials.Cobalt.getDust(2)) - .itemOutputs(ALLOY.MARAGING250.getDust(24)).noFluidInputs().noFluidOutputs().duration(1 * MINUTES) - .eut(TierEU.RECIPE_EV).addTo(sMixerRecipes); + .itemOutputs(ALLOY.MARAGING250.getDust(24)).duration(1 * MINUTES).eut(TierEU.RECIPE_EV) + .addTo(sMixerRecipes); } private static void chemicalReactorRecipes() { @@ -1309,7 +1302,7 @@ public class RECIPES_GREGTECH { ItemUtils.getSimpleStack(ModItems.itemBombCasing, 4), ItemUtils.getSimpleStack(RocketFuels.Ammonium_Nitrate_Dust, 8)) .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemBombUnf, 4)) - .fluidInputs(Materials.Fuel.getFluid(1000)).noFluidOutputs().duration(5 * MINUTES).eut(TierEU.RECIPE_LV) + .fluidInputs(Materials.Fuel.getFluid(1000)).duration(5 * MINUTES).eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); GT_Values.RA.stdBuilder() @@ -1317,8 +1310,8 @@ public class RECIPES_GREGTECH { ItemUtils.getSimpleStack(ModItems.itemBombUnf, 4), ItemUtils.getSimpleStack(ModItems.itemDetCable, 4)) .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemBomb, 4)) - .fluidInputs(FluidUtils.getFluidStack(RocketFuels.Kerosene, 100)).noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .fluidInputs(FluidUtils.getFluidStack(RocketFuels.Kerosene, 100)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); GT_Values.RA.stdBuilder() .itemInputs( @@ -1370,31 +1363,31 @@ public class RECIPES_GREGTECH { private static void compressorRecipes() { GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Clay, 1L)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Clay, 1L)).duration(15 * SECONDS) + .eut(2).addTo(sCompressorRecipes); GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)).duration(15 * SECONDS) + .eut(2).addTo(sCompressorRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemList.FusionComputer_UV.get(9)) - .itemOutputs(GregtechItemList.Compressed_Fusion_Reactor.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * HOURS + 50 * MINUTES).eut(TierEU.RECIPE_UV).addTo(sCompressorRecipes); + .itemOutputs(GregtechItemList.Compressed_Fusion_Reactor.get(1)).duration(1 * HOURS + 50 * MINUTES) + .eut(TierEU.RECIPE_UV).addTo(sCompressorRecipes); } private static void macerationRecipes() { GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)).noFluidInputs() - .noFluidOutputs().duration(44 * SECONDS).eut(4).addTo(sMaceratorRecipes); + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)).duration(44 * SECONDS) + .eut(4).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Broken.get(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 3L)).noFluidInputs() - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 3L)).duration(20 * SECONDS) + .eut(2).addTo(sMaceratorRecipes); if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) { GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 4L)).noFluidInputs() - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 4L)) + .duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index 387bd16539..acd874ee44 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -204,8 +204,8 @@ public class RECIPES_General { ItemList.Large_Fluid_Cell_Steel.get(1), CI.getNumberedAdvancedCircuit(4)) .itemOutputs(VolumetricFlaskHelper.getLargeVolumetricFlask(2)) - .fluidInputs(FluidUtils.getFluidStack("molten.borosilicateglass", 2000)).noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .fluidInputs(FluidUtils.getFluidStack("molten.borosilicateglass", 2000)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -214,8 +214,8 @@ public class RECIPES_General { ItemList.Large_Fluid_Cell_TungstenSteel.get(1), CI.getNumberedAdvancedCircuit(5)) .itemOutputs(VolumetricFlaskHelper.getGiganticVolumetricFlask(2)) - .fluidInputs(FluidUtils.getFluidStack("molten.borosilicateglass", 8000)).noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .fluidInputs(FluidUtils.getFluidStack("molten.borosilicateglass", 8000)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); // Mining Explosive Logger.RECIPE("[Inspection] Explosives"); @@ -283,8 +283,8 @@ public class RECIPES_General { Materials.Sapphire.getBlocks(32), ItemUtils.getSimpleStack(Blocks.gold_block, 32)) .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemMagicFeather, 1)) - .fluidInputs(Materials.Silver.getMolten(32 * 144)).noFluidOutputs().duration(2 * MINUTES) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Silver.getMolten(32 * 144)).duration(2 * MINUTES).eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); // Pest Killer GT_Values.RA.stdBuilder() @@ -295,8 +295,8 @@ public class RECIPES_General { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(0), 2), CI.getNumberedCircuit(16)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockPestKiller)) - .fluidInputs(FluidUtils.getHotWater(500)).noFluidOutputs().duration(1 * MINUTES) - .eut(TierEU.RECIPE_LV / 2).addTo(sAssemblerRecipes); + .fluidInputs(FluidUtils.getHotWater(500)).duration(1 * MINUTES).eut(TierEU.RECIPE_LV / 2) + .addTo(sAssemblerRecipes); } private static boolean addCompressedObsidian() { diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index 70620f9749..82d28751de 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -1,15 +1,20 @@ package gtPlusPlus.core.recipe; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; +import static gregtech.api.util.GT_RecipeBuilder.HOURS; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import net.minecraft.item.ItemStack; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IOreRecipeRegistrator; 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.util.minecraft.ItemUtils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; @@ -24,32 +29,18 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) != null) { - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L), - GT_Utility.copyAmount(0L, new Object[] { aStack }), - ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1), - 4 * 60 * 20, - 2000); - } else { - Logger.INFO( - "plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github."); - Logger.INFO( - "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); - } - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLithium", 1) != null) { - GT_Values.RA.addLaserEngraverRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L), - GT_Utility.copyAmount(0L, new Object[] { aStack }), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), - 2 * 60 * 20, - 2000); - } else { - Logger.INFO( - "dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github."); - Logger.INFO( - "This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself."); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L), + GT_Utility.copyAmount(0L, aStack)) + .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1)) + .duration(4 * MINUTES).eut(TierEU.RECIPE_EV).addTo(sLaserEngraverRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L), + GT_Utility.copyAmount(0L, aStack)) + .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1)).duration(2 * MINUTES) + .eut(TierEU.RECIPE_EV).addTo(sLaserEngraverRecipes); } else if (aOreDictName.equals(OreDictNames.craftingLensLime.toString())) { // Coil Wires @@ -76,65 +67,31 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { ItemStack wireT4a = ItemUtils.getItemStackOfAmountFromOreDict(wire + "Naquadah", 1); // T1 - GT_Values.RA.addLaserEngraverRecipe( - wireT1a, - GT_Utility.copyAmount(0L, new Object[] { aStack }), - coilWire1, - 10 * 20, - 500); - GT_Values.RA.addLaserEngraverRecipe( - wireT1b, - GT_Utility.copyAmount(0L, new Object[] { aStack }), - coilWire1, - 10 * 20, - 500); + GT_Values.RA.stdBuilder().itemInputs(wireT1a, GT_Utility.copyAmount(0L, aStack)).itemOutputs(coilWire1) + .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sLaserEngraverRecipes); + GT_Values.RA.stdBuilder().itemInputs(wireT1b, GT_Utility.copyAmount(0L, aStack)).itemOutputs(coilWire1) + .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sLaserEngraverRecipes); // T2 - GT_Values.RA.addLaserEngraverRecipe( - wireT2a, - GT_Utility.copyAmount(0L, new Object[] { aStack }), - coilWire2, - 20 * 20, - 2000); - GT_Values.RA.addLaserEngraverRecipe( - wireT2b, - GT_Utility.copyAmount(0L, new Object[] { aStack }), - coilWire2, - 20 * 20, - 2000); + GT_Values.RA.stdBuilder().itemInputs(wireT2a, GT_Utility.copyAmount(0L, aStack)).itemOutputs(coilWire2) + .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sLaserEngraverRecipes); + GT_Values.RA.stdBuilder().itemInputs(wireT2b, GT_Utility.copyAmount(0L, aStack)).itemOutputs(coilWire2) + .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sLaserEngraverRecipes); // T3 - GT_Values.RA.addLaserEngraverRecipe( - wireT3a, - GT_Utility.copyAmount(0L, new Object[] { aStack }), - coilWire3, - 30 * 20, - 8000); - GT_Values.RA.addLaserEngraverRecipe( - wireT3b, - GT_Utility.copyAmount(0L, new Object[] { aStack }), - coilWire3, - 30 * 20, - 8000); - GT_Values.RA.addLaserEngraverRecipe( - wireT3c, - GT_Utility.copyAmount(0L, new Object[] { aStack }), - coilWire3, - 30 * 20, - 8000); + GT_Values.RA.stdBuilder().itemInputs(wireT3a, GT_Utility.copyAmount(0L, aStack)).itemOutputs(coilWire3) + .duration(30 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sLaserEngraverRecipes); + GT_Values.RA.stdBuilder().itemInputs(wireT3b, GT_Utility.copyAmount(0L, aStack)).itemOutputs(coilWire3) + .duration(30 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sLaserEngraverRecipes); + GT_Values.RA.stdBuilder().itemInputs(wireT3c, GT_Utility.copyAmount(0L, aStack)).itemOutputs(coilWire3) + .duration(30 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sLaserEngraverRecipes); // T4 - GT_Values.RA.addLaserEngraverRecipe( - wireT4a, - GT_Utility.copyAmount(0L, new Object[] { aStack }), - coilWire4, - 40 * 20, - 32000); + GT_Values.RA.stdBuilder().itemInputs(wireT4a, GT_Utility.copyAmount(0L, aStack)).itemOutputs(coilWire4) + .duration(40 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sLaserEngraverRecipes); } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) { - GT_Values.RA.addLaserEngraverRecipe( - ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), - GT_Utility.copyAmount(0L, new Object[] { aStack }), - ItemUtils.getSimpleStack(Dimension_Everglades.portalItem), - 360 * 60 * 20, - 4096); + GT_Values.RA.stdBuilder() + .itemInputs(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, aStack)) + .itemOutputs(ItemUtils.getSimpleStack(Dimension_Everglades.portalItem)).duration(3 * HOURS) + .eut(TierEU.RECIPE_IV).addTo(sLaserEngraverRecipes); } } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java index 12792ab8ea..55f55816a8 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java @@ -1,63 +1,41 @@ package gtPlusPlus.core.recipe; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBrewingRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gtPlusPlus.core.material.MISC_MATERIALS.BRINE; import static gtPlusPlus.core.material.MISC_MATERIALS.HYDROGEN_CHLORIDE; import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_HIGH; import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_LOW; import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_MID; -import static gtPlusPlus.core.material.MISC_MATERIALS.SALT_WATER; -import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_CHLORIDE; -import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_HYDROXIDE; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.ORES; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class RECIPES_RareEarthProcessing { - private static ItemStack mDustSodiumHydroxide; - private static ItemStack mDustSalt; - private static FluidStack mSaltWater; - private static FluidStack mBrine; - private static FluidStack mHydrogenChloride; - public static void init() { - // Salt Check and Assignment - mDustSalt = ItemUtils.getItemStackOfAmountFromOreDict("dustSalt", 1); - if (mDustSalt == null) { - MaterialUtils.generateSpecialDustAndAssignToAMaterial(SODIUM_CHLORIDE, false); - mDustSalt = SODIUM_CHLORIDE.getDust(1); - } else { - SODIUM_CHLORIDE.registerComponentForMaterial(OrePrefixes.dust, mDustSalt); - } - - // Salt water Check and Assignment - mSaltWater = FluidUtils.getFluidStack("saltwater", 1000); - if (mSaltWater == null) { - Fluid f = SALT_WATER.generateFluid(); - SALT_WATER.registerComponentForMaterial(FluidUtils.getFluidStack(f, 1000)); - mSaltWater = SALT_WATER.getFluidStack(1000); - } else { - SALT_WATER.registerComponentForMaterial(FluidUtils.getFluidStack(mSaltWater, 1000)); - } - // Brine Check and assignment - mBrine = FluidUtils.getFluidStack("brine", 1000); + FluidStack mBrine = FluidUtils.getFluidStack("brine", 1000); if (mBrine == null) { Fluid f = BRINE.generateFluid(); BRINE.registerComponentForMaterial(FluidUtils.getFluidStack(f, 1000)); @@ -66,22 +44,8 @@ public class RECIPES_RareEarthProcessing { BRINE.registerComponentForMaterial(FluidUtils.getFluidStack(mBrine, 1000)); } - // Check Sodium Hydroxide Exists, generate if not. - mDustSodiumHydroxide = ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 1); - if (mDustSodiumHydroxide == null) { - mDustSodiumHydroxide = ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide_GT5U", 1); - if (mDustSodiumHydroxide == null) { - MaterialUtils.generateSpecialDustAndAssignToAMaterial(SODIUM_HYDROXIDE, false); - mDustSodiumHydroxide = SODIUM_HYDROXIDE.getDust(1); - } else { - SODIUM_HYDROXIDE.registerComponentForMaterial(OrePrefixes.dust, mDustSodiumHydroxide); - } - } else { - SODIUM_HYDROXIDE.registerComponentForMaterial(OrePrefixes.dust, mDustSodiumHydroxide); - } - // Hydrogen Chloride Check and assignment - mHydrogenChloride = FluidUtils.getFluidStack("hydrogenchloride", 1000); + FluidStack mHydrogenChloride = FluidUtils.getFluidStack("hydrogenchloride", 1000); if (mHydrogenChloride == null) { HYDROGEN_CHLORIDE.generateFluid(); mHydrogenChloride = BRINE.getFluidStack(1000); @@ -90,50 +54,34 @@ public class RECIPES_RareEarthProcessing { } // Add Process for creating Brine - CORE.RA.addBrewingRecipe( - ItemUtils.getSimpleStack(mDustSalt, 16), - MISC_MATERIALS.SALT_WATER.getFluidStack(2000), - FluidUtils.getFluidStack(mBrine, 4000), - 20 * 20, - 120, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 16L)) + .fluidInputs(Materials.SaltWater.getFluid(2000L)).fluidOutputs(FluidUtils.getFluidStack(mBrine, 4000)) + .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sBrewingRecipes); // Chloralkali process - GT_Values.RA.addElectrolyzerRecipe( - CI.getNumberedCircuit(16), - CI.emptyCells(4), - FluidUtils.getFluidStack(mBrine, 4000), - null, // Out - ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2), - ItemUtils.getSimpleStack(mDustSodiumHydroxide, 2), - null, - null, - null, - new int[] { 10000, 10000, 10000 }, - 20 * 30, - 120); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(2L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1L)) + .fluidInputs(FluidUtils.getFluidStack(mBrine, 2000)).duration(30 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); // Generate Special Laser Recipe - CORE.RA.addMixerRecipe( - CI.getNumberedBioCircuit(2), - ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), - null, - null, - null, - ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 2), - null, - null, - null, - 20 * 10, - 480); - - CORE.RA.addUvLaserRecipe( - ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 4), - 20 * 30, - 480); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), + CI.getNumberedBioCircuit(2)) + .itemOutputs(ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 2)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 4), + GregtechItemList.Laser_Lens_WoodsGlass.get(0)) + .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 4)) + .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).noOptimize().addTo(sLaserEngraverRecipes); // Set Material Tiers correctly ORES.GREENOCKITE.vTier = 1; @@ -162,72 +110,37 @@ public class RECIPES_RareEarthProcessing { MaterialGenerator.generateOreMaterial(RARE_EARTH_MID); MaterialGenerator.generateOreMaterial(RARE_EARTH_HIGH); - ItemStack aRareEarth = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 1L); - - Fluid aSulfuric = FluidUtils.getFluidStack("sulfuricacid", 1).getFluid(); - Fluid aHydrocholric = FluidUtils.getFluidStack("hydrogenchloride", 1).getFluid(); - Fluid aNitric = FluidUtils.getFluidStack("hydrofluoricacid", 1).getFluid(); + // industrial strength HCl + Fluid aHydrochloric = FluidUtils.getFluidStack("hydrogenchloride", 1).getFluid(); // LV Rare Earth - GT_Values.RA.addChemicalBathRecipe( - ItemUtils.getSimpleStack(aRareEarth, 3), - FluidUtils.getFluidStack(aSulfuric, 1000), - RARE_EARTH_LOW.getCrushed(2), - RARE_EARTH_LOW.getCrushed(2), - RARE_EARTH_LOW.getCrushed(2), - new int[] { 10000, 10000, 10000 }, - 20 * 30, - MaterialUtils.getVoltageForTier(1)); + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) + .itemOutputs(RARE_EARTH_LOW.getCrushed(2), RARE_EARTH_LOW.getCrushed(2), RARE_EARTH_LOW.getCrushed(2)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000L)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sChemicalBathRecipes); // HV Rare Earth - GT_Values.RA.addChemicalBathRecipe( - ItemUtils.getSimpleStack(aRareEarth, 6), - FluidUtils.getFluidStack(aHydrocholric, 2000), - RARE_EARTH_MID.getCrushed(4), - RARE_EARTH_MID.getCrushed(4), - RARE_EARTH_MID.getCrushed(4), - new int[] { 10000, 9000, 8000 }, - 20 * 30, - MaterialUtils.getVoltageForTier(3)); + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) + .itemOutputs(RARE_EARTH_MID.getCrushed(2), RARE_EARTH_MID.getCrushed(2), RARE_EARTH_MID.getCrushed(2)) + .outputChances(10000, 9000, 8000).fluidInputs(FluidUtils.getFluidStack(aHydrochloric, 1000)) + .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sChemicalBathRecipes); // IV Rare Earth - GT_Values.RA.addChemicalBathRecipe( - ItemUtils.getSimpleStack(aRareEarth, 9), - FluidUtils.getHydrofluoricAcid(3000), - RARE_EARTH_HIGH.getCrushed(6), - RARE_EARTH_HIGH.getCrushed(6), - RARE_EARTH_HIGH.getCrushed(6), - new int[] { 10000, 9000, 8000 }, - 20 * 30, - MaterialUtils.getVoltageForTier(5)); - - if (FluidUtils.doesHydrofluoricAcidGtExist()) { - // IV Rare Earth - GT_Values.RA.addChemicalBathRecipe( - ItemUtils.getSimpleStack(aRareEarth, 9), - FluidUtils.getHydrofluoricAcidGT(6000), - RARE_EARTH_HIGH.getCrushed(6), - RARE_EARTH_HIGH.getCrushed(6), - RARE_EARTH_HIGH.getCrushed(6), - new int[] { 9000, 8000, 7000 }, - 20 * 30, - MaterialUtils.getVoltageForTier(5)); - } - } - - public static void processCopperRecipes() { - - // Rare Earth Processing - /* - * GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRareEarth", 1), new ItemStack[] { - * ELEMENT.getInstance().YTTRIUM.getSmallDust(1), ELEMENT.getInstance().NEODYMIUM.getSmallDust(1), - * ELEMENT.getInstance().LANTHANUM.getSmallDust(1), ELEMENT.getInstance().CERIUM.getSmallDust(1), - * ELEMENT.getInstance().CADMIUM.getSmallDust(1), ELEMENT.getInstance().CAESIUM.getSmallDust(1), - * ORES.SAMARSKITE_YB.getSmallDust(1), ORES.FLORENCITE.getSmallDust(1), ORES.FLUORCAPHITE.getSmallDust(1), - * //ELEMENT.getInstance().YTTERBIUM.getTinyDust(1), //ELEMENT.getInstance().SAMARIUM.getTinyDust(1), - * //ELEMENT.getInstance().GADOLINIUM.getTinyDust(1) }, new int[] { 2000, 2000, 2000, 2000, 2000, 2000, 2000, - * 2000, 2000 }, 20 * 30, 500); - */ + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) + .itemOutputs( + RARE_EARTH_HIGH.getCrushed(2), + RARE_EARTH_HIGH.getCrushed(2), + RARE_EARTH_HIGH.getCrushed(2)) + .outputChances(10000, 9000, 8000).fluidInputs(FluidUtils.getHydrofluoricAcid(1000)) + .duration(10 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sChemicalBathRecipes); + // IV Rare Earth + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 3L)) + .itemOutputs( + RARE_EARTH_HIGH.getCrushed(2), + RARE_EARTH_HIGH.getCrushed(2), + RARE_EARTH_HIGH.getCrushed(2)) + .outputChances(9000, 8000, 7000).fluidInputs(Materials.HydrofluoricAcid.getFluid(2000L)) + .duration(10 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sChemicalBathRecipes); } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 0646b26866..1b06ea58e0 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -1,5 +1,10 @@ package gtPlusPlus.core.util.minecraft; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; + import java.util.HashMap; import net.minecraft.init.Items; @@ -12,6 +17,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import gregtech.api.enums.Dyes; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; @@ -19,10 +25,8 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.FluidGT6; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; -import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; @@ -187,26 +191,20 @@ public class FluidUtils { aEmptyContainer, aFluidAmount, aGenerateCell); - if (g != null) { - if (aMaterial != null) { - switch (aState) { - case 1: { - aMaterial.mFluid = (g); - break; - } - case 2: { - aMaterial.mGas = (g); - break; - } - case 3: { - aMaterial.mPlasma = (g); - break; - } + if (aMaterial != null) { + switch (aState) { + case 1 -> { + aMaterial.mFluid = (g); + } + case 2 -> { + aMaterial.mGas = (g); + } + case 3 -> { + aMaterial.mPlasma = (g); } } - return g; } - return null; + return g; } public static Fluid addGTFluid(final String aName, final String aLocalized, final short[] aRGBa, final int aState, @@ -257,7 +255,7 @@ public class FluidUtils { aGenerateCell); } - // Gass + // Gas public static Fluid addGtGas(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateCell) { @@ -342,29 +340,24 @@ public class FluidUtils { GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalName); if (FluidRegistry.registerFluid(rFluid)) { switch (aState) { - case 0: { + case 0 -> { rFluid.setGaseous(false); rFluid.setViscosity(10000); - break; } - case 1: - case 4: { + case 1, 4 -> { rFluid.setGaseous(false); rFluid.setViscosity(1000); - break; } - case 2: { + case 2 -> { rFluid.setGaseous(true); rFluid.setDensity(-100); rFluid.setViscosity(200); - break; } - case 3: { + case 3 -> { rFluid.setGaseous(true); rFluid.setDensity(-10000); rFluid.setViscosity(10); rFluid.setLuminosity(15); - break; } } } @@ -417,22 +410,19 @@ public class FluidUtils { new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) { - CORE.RA.addFluidCannerRecipe(CI.emptyCells(1), aFullContainer, new FluidStack(rFluid, aFluidAmount)); - } else { - // Utils.LOG_INFO("Failed creating recipes to fill/empty cells of "+aName+"."); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Empty.get(1L)).itemOutputs(aFullContainer) + .fluidInputs(new FluidStack(rFluid, aFluidAmount)).duration(4).eut(1).addTo(sFluidCannerRecipes); } return rFluid; } public static boolean valid(final Object aStack) { - return (aStack != null) && (aStack instanceof ItemStack) - && (((ItemStack) aStack).getItem() != null) + return (aStack instanceof ItemStack) && (((ItemStack) aStack).getItem() != null) && (((ItemStack) aStack).stackSize >= 0); } public static boolean invalid(final Object aStack) { - return (aStack == null) || !(aStack instanceof ItemStack) - || (((ItemStack) aStack).getItem() == null) + return !(aStack instanceof ItemStack) || (((ItemStack) aStack).getItem() == null) || (((ItemStack) aStack).stackSize < 0); } @@ -522,11 +512,6 @@ public class FluidUtils { FluidStack aFStack = (FluidUtils.getFluidStack("molten" + "." + unlocalizedName.toLowerCase(), 1)); if (aFStack == null) { Logger.WARNING("Generating our own fluid."); - /* - * ItemStack cell = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1); if (cell - * == null){ final Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA); cell = - * ItemUtils.getSimpleStack(temp); } - */ final Fluid gtFluid = FluidUtils.addGTFluid( unlocalizedName, "Molten " + localizedName, @@ -600,20 +585,14 @@ public class FluidUtils { aGenerateCell); if (dustStack != null) { - CORE.RA.addFluidExtractionRecipe( - dustStack, // Input 2 - FluidUtils.getFluidStack(gtFluid, amountPerItem), // Fluid Output - 1 * 20, // Duration - 16 // Eu Tick - ); + GT_Values.RA.stdBuilder().itemInputs(dustStack) + .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem)).duration(1 * SECONDS).eut(16) + .addTo(sFluidExtractionRecipes); } if (dustStack2 != null) { - CORE.RA.addFluidExtractionRecipe( - dustStack2, // Input 2 - FluidUtils.getFluidStack(gtFluid, amountPerItem), // Fluid Output - 1 * 20, // Duration - 16 // Eu Tick - ); + GT_Values.RA.stdBuilder().itemInputs(dustStack2) + .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem)).duration(1 * SECONDS).eut(16) + .addTo(sFluidExtractionRecipes); } return gtFluid; @@ -646,10 +625,6 @@ public class FluidUtils { } else { gtFluid = FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1).getFluid(); } - // Generate a Cell if we need to - // if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){ - // new BaseItemCell(unlocalizedName, localizedName, RGBA, gtFluid); - // } return gtFluid; } @@ -671,11 +646,6 @@ public class FluidUtils { } else { gtFluid = FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1).getFluid(); } - // Generate a Cell if we need to - /* - * if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1) == null){ new - * BaseItemCell(unlocalizedName, localizedName, RGBA, gtFluid); } - */ return gtFluid; } |