From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 23 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 538 +++++++-------------- .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 9 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 168 +++---- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 88 ++-- .../recipe/RecipeLoader_MolecularTransformer.java | 5 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 249 +++++----- .../recipe/RecipeLoader_NuclearFuelProcessing.java | 229 ++++----- 8 files changed, 510 insertions(+), 799 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java index 3fec531a12..379d8acda0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import java.util.HashMap; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; @@ -9,15 +14,11 @@ import gtPlusPlus.api.objects.data.WeightedCollection; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import java.util.HashMap; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_AlgaeFarm { private static final HashMap> mRecipeCache = new HashMap>(); - private static final HashMap> mRecipeCompostCache = - new HashMap>(); + private static final HashMap> mRecipeCompostCache = new HashMap>(); public static void generateRecipes() { for (int i = 0; i < 10; i++) { @@ -70,7 +71,8 @@ public class RecipeLoader_AlgaeFarm { aOutputTimeMulti.put(i, aValue); } - final int[] aDurations = new int[] {2000, 1800, 1600, 1400, 1200, 1000, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1}; + final int[] aDurations = new int[] { 2000, 1800, 1600, 1400, 1200, 1000, 512, 256, 128, 64, 32, 16, 8, 4, 2, + 1 }; ItemStack[] aInputs = new ItemStack[] {}; @@ -78,8 +80,9 @@ public class RecipeLoader_AlgaeFarm { // Make it use 4 compost per tier if we have some available // Compost consumption maxes out at 1 stack per cycle ItemStack aCompost = ItemUtils.getSimpleStack( - AgriculturalChem.mCompost, aTier > 1 ? (int) Math.min(64, Math.pow(2, aTier - 1)) : 1); - aInputs = new ItemStack[] {aCompost}; + AgriculturalChem.mCompost, + aTier > 1 ? (int) Math.min(64, Math.pow(2, aTier - 1)) : 1); + aInputs = new ItemStack[] { aCompost }; // Boost Tier by one if using compost so it gets a speed boost aTier++; } @@ -93,8 +96,8 @@ public class RecipeLoader_AlgaeFarm { aOutputs, (Object) null, new int[] {}, - new FluidStack[] {GT_Values.NF}, - new FluidStack[] {GT_Values.NF}, + new FluidStack[] { GT_Values.NF }, + new FluidStack[] { GT_Values.NF }, (int) (aDurations[aTier] * aOutputTimeMulti.get() / 2), // Time 0, 0); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java index c00b9b08e2..d92b117b65 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java @@ -1,9 +1,13 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import com.dreammaster.gthandler.GT_CoreModSupport; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.block.QuantumGlassBlock; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -19,8 +23,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_ChemicalSkips { @@ -48,247 +50,175 @@ public class RecipeLoader_ChemicalSkips { ItemStack biocells = GT_Utility.copyAmountUnsafe(64 * 32, ItemList.Circuit_Chip_Biocell.get(1)); // Platline CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32), - ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0) - }, + new ItemStack[] { WerkstoffLoader.PTMetallicPowder.get(OrePrefixes.dust, 32), + ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] {}, - new ItemStack[] { - Materials.Platinum.getDust(64), - Materials.Palladium.getDust(64), - Materials.Iridium.getDust(64), - Materials.Osmium.getDust(64), - WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64), - WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64) - }, - new int[] {1667, 1667, 1667, 1667, 1667, 1667}, + new ItemStack[] { Materials.Platinum.getDust(64), Materials.Palladium.getDust(64), + Materials.Iridium.getDust(64), Materials.Osmium.getDust(64), + WerkstoffLoader.Rhodium.get(OrePrefixes.dust, 64), + WerkstoffLoader.Ruthenium.get(OrePrefixes.dust, 64) }, + new int[] { 1667, 1667, 1667, 1667, 1667, 1667 }, 20 * 20, (int) GT_Values.VP[8], 1); // Early Plastics CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 0) - }, - new FluidStack[] { - Materials.Oxygen.getGas(1000 * 16), - Materials.Hydrogen.getGas(1000 * 16), - Materials.Chlorine.getGas(1000 * 16), - Materials.Fluorine.getGas(1000 * 16) - }, - new FluidStack[] { - Materials.Plastic.getMolten(144 * 256), - Materials.PolyvinylChloride.getMolten(144 * 128), - Materials.Polystyrene.getMolten(144 * 64), - Materials.Polytetrafluoroethylene.getMolten(144 * 128), - Materials.Epoxid.getMolten(144 * 64), - Materials.Polybenzimidazole.getMolten(144 * 64) - }, + new ItemStack[] { Materials.Carbon.getDust(64), + ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 0) }, + new FluidStack[] { Materials.Oxygen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16), + Materials.Chlorine.getGas(1000 * 16), Materials.Fluorine.getGas(1000 * 16) }, + new FluidStack[] { Materials.Plastic.getMolten(144 * 256), + Materials.PolyvinylChloride.getMolten(144 * 128), Materials.Polystyrene.getMolten(144 * 64), + Materials.Polytetrafluoroethylene.getMolten(144 * 128), Materials.Epoxid.getMolten(144 * 64), + Materials.Polybenzimidazole.getMolten(144 * 64) }, null, - new int[] {2000, 2000, 2000, 2000, 2000, 2000}, + new int[] { 2000, 2000, 2000, 2000, 2000, 2000 }, 20 * 20, (int) GT_Values.VP[7], 1); // Early Rubbers/Cable Materials CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Carbon.getDust(64), ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 0) - }, - new FluidStack[] { - Materials.Oxygen.getGas(1000 * 16), - Materials.Hydrogen.getGas(1000 * 16), - Materials.Chlorine.getGas(1000 * 16) - }, - new FluidStack[] { - Materials.Silicone.getMolten(144 * 64), - Materials.StyreneButadieneRubber.getMolten(144 * 64), - Materials.PolyphenyleneSulfide.getMolten(144 * 128), - Materials.Rubber.getMolten(144 * 256) - }, + new ItemStack[] { Materials.Carbon.getDust(64), + ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 0) }, + new FluidStack[] { Materials.Oxygen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16), + Materials.Chlorine.getGas(1000 * 16) }, + new FluidStack[] { Materials.Silicone.getMolten(144 * 64), + Materials.StyreneButadieneRubber.getMolten(144 * 64), + Materials.PolyphenyleneSulfide.getMolten(144 * 128), Materials.Rubber.getMolten(144 * 256) }, null, - new int[] {2500, 2500, 2500, 2500}, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[7], 1); // Glues and Solders CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Carbon.getDust(32), - Materials.Bismuth.getDust(32), - ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 0) - }, - new FluidStack[] {Materials.Oxygen.getFluid(10000), Materials.Hydrogen.getFluid(10000)}, - new FluidStack[] { - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32), - Materials.AdvancedGlue.getFluid(1000 * 16), - ALLOY.INDALLOY_140.getFluidStack(144 * 64), - Materials.SolderingAlloy.getMolten(144 * 128) - }, - new ItemStack[] {ItemList.StableAdhesive.get(1)}, - new int[] {2000, 2000, 2000, 2000, 2000}, + new ItemStack[] { Materials.Carbon.getDust(32), Materials.Bismuth.getDust(32), + ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 0) }, + new FluidStack[] { Materials.Oxygen.getFluid(10000), Materials.Hydrogen.getFluid(10000) }, + new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(1000 * 32), + Materials.AdvancedGlue.getFluid(1000 * 16), ALLOY.INDALLOY_140.getFluidStack(144 * 64), + Materials.SolderingAlloy.getMolten(144 * 128) }, + new ItemStack[] { ItemList.StableAdhesive.get(1) }, + new int[] { 2000, 2000, 2000, 2000, 2000 }, 20 * 20, (int) GT_Values.VP[8], 1); // Titanium, Tungsten, Indium CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Lead.getDust(16), - Materials.Bauxite.getDust(32), - Materials.Tungstate.getDust(16), - ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 0) - }, + new ItemStack[] { Materials.Lead.getDust(16), Materials.Bauxite.getDust(32), + Materials.Tungstate.getDust(16), + ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] {}, - new ItemStack[] { - Materials.Titanium.getDust(64), - Materials.TungstenSteel.getDust(64), - Materials.TungstenCarbide.getDust(64), - Materials.Indium.getDust(64) - }, - new int[] {2500, 2500, 2500, 2500}, + new ItemStack[] { Materials.Titanium.getDust(64), Materials.TungstenSteel.getDust(64), + Materials.TungstenCarbide.getDust(64), Materials.Indium.getDust(64) }, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[8], 1); // Thorium, Uranium, Plutonium CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Thorium.getDust(32), - Materials.Uranium.getDust(32), - ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 0) - }, + new ItemStack[] { Materials.Thorium.getDust(32), Materials.Uranium.getDust(32), + ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] {}, - new ItemStack[] { - ELEMENT.getInstance().THORIUM232.getDust(64), - ELEMENT.getInstance().URANIUM233.getDust(64), - Materials.Uranium235.getDust(64), - ELEMENT.getInstance().PLUTONIUM238.getDust(64), - Materials.Plutonium.getDust(64), - Materials.Plutonium241.getDust(64) - }, - new int[] {1667, 1667, 1667, 1667, 1667, 1667}, + new ItemStack[] { ELEMENT.getInstance().THORIUM232.getDust(64), + ELEMENT.getInstance().URANIUM233.getDust(64), Materials.Uranium235.getDust(64), + ELEMENT.getInstance().PLUTONIUM238.getDust(64), Materials.Plutonium.getDust(64), + Materials.Plutonium241.getDust(64) }, + new int[] { 1667, 1667, 1667, 1667, 1667, 1667 }, 20 * 20, (int) GT_Values.VP[8], 1); // Monaline CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Monazite.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) - }, + new ItemStack[] { Materials.Monazite.getDust(32), + ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] {}, - new ItemStack[] { - Materials.Cerium.getDust(64), - Materials.Gadolinium.getDust(64), - Materials.Samarium.getDust(64), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium - ItemList.SuperconductorComposite.get(1) - }, - new int[] {1667, 1667, 1667, 1667, 1667, 1667}, + new ItemStack[] { Materials.Cerium.getDust(64), Materials.Gadolinium.getDust(64), + Materials.Samarium.getDust(64), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium + ItemList.SuperconductorComposite.get(1) }, + new int[] { 1667, 1667, 1667, 1667, 1667, 1667 }, 20 * 20, (int) GT_Values.VP[9], 2); // Bastline CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Bastnasite.getDust(32), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) - }, + new ItemStack[] { Materials.Bastnasite.getDust(32), + ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 0) }, null, null, - new ItemStack[] { - Materials.Holmium.getDust(64), - Materials.Cerium.getDust(64), - Materials.Samarium.getDust(64), - Materials.Gadolinium.getDust(64), - Materials.Lanthanum.getDust(64) - }, - new int[] {2000, 2000, 2000, 2000, 2000}, + new ItemStack[] { Materials.Holmium.getDust(64), Materials.Cerium.getDust(64), + Materials.Samarium.getDust(64), Materials.Gadolinium.getDust(64), + Materials.Lanthanum.getDust(64) }, + new int[] { 2000, 2000, 2000, 2000, 2000 }, 20 * 20, (int) GT_Values.VP[9], 2); // Stem Cells CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Calcium.getDust(32), - Materials.MeatRaw.getDust(32), - GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 32, 2), - ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0) - }, + new ItemStack[] { Materials.Calcium.getDust(32), Materials.MeatRaw.getDust(32), + GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 32, 2), + ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0) }, new FluidStack[] {}, - new FluidStack[] { - Materials.GrowthMediumRaw.getFluid(1000 * 1024), - Materials.GrowthMediumSterilized.getFluid(1000 * 512) - }, - new ItemStack[] {stemcells}, - new int[] {3333, 3333, 3333}, + new FluidStack[] { Materials.GrowthMediumRaw.getFluid(1000 * 1024), + Materials.GrowthMediumSterilized.getFluid(1000 * 512) }, + new ItemStack[] { stemcells }, + new int[] { 3333, 3333, 3333 }, 20 * 20, (int) GT_Values.VP[10], 3); // Lategame Plastics (Missing Radox Polymer and Heavy Radox) CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - Materials.Carbon.getDust(64), - Materials.Osmium.getDust(24), - ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) - }, - new FluidStack[] {Materials.Hydrogen.getGas(1000 * 16), Materials.Nitrogen.getGas(1000 * 16)}, - new FluidStack[] { - GT_CoreModSupport.Xenoxene.getFluid(1000 * 16), - GT_CoreModSupport.RadoxPolymer.getMolten(144 * 64), - GT_CoreModSupport.RadoxHeavy.getFluid(1000 * 16), - MaterialsKevlar.Kevlar.getMolten(144 * 64) - }, + new ItemStack[] { Materials.Carbon.getDust(64), Materials.Osmium.getDust(24), + ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) }, + new FluidStack[] { Materials.Hydrogen.getGas(1000 * 16), Materials.Nitrogen.getGas(1000 * 16) }, + new FluidStack[] { GT_CoreModSupport.Xenoxene.getFluid(1000 * 16), + GT_CoreModSupport.RadoxPolymer.getMolten(144 * 64), + GT_CoreModSupport.RadoxHeavy.getFluid(1000 * 16), MaterialsKevlar.Kevlar.getMolten(144 * 64) }, new ItemStack[] {}, - new int[] {2500, 2500, 2500, 2500}, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[11], 4); // Lategame Kevlar using Kevlar bee comb CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - GT_Bees.combs.getStackForType(CombType.KEVLAR, 24), - Materials.Carbon.getDust(64), - ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) - }, - new FluidStack[] {Materials.Nitrogen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16)}, - new FluidStack[] { - MaterialsKevlar.PolyurethaneResin.getFluid(1000 * 32), - MaterialsKevlar.LiquidCrystalKevlar.getFluid(144 * 32), - MaterialsKevlar.Kevlar.getMolten(144 * 64) - }, + new ItemStack[] { GT_Bees.combs.getStackForType(CombType.KEVLAR, 24), Materials.Carbon.getDust(64), + ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 0) }, + new FluidStack[] { Materials.Nitrogen.getGas(1000 * 16), Materials.Hydrogen.getGas(1000 * 16) }, + new FluidStack[] { MaterialsKevlar.PolyurethaneResin.getFluid(1000 * 32), + MaterialsKevlar.LiquidCrystalKevlar.getFluid(144 * 32), + MaterialsKevlar.Kevlar.getMolten(144 * 64) }, new ItemStack[] {}, - new int[] {2500, 2500, 2500, 2500}, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[11], 4); // Bio Cells and Mutated Solder CORE.RA.addQuantumTransformerRecipe( - new ItemStack[] { - ItemList.Circuit_Chip_Stemcell.get(16), - Materials.InfinityCatalyst.getDust(4), - ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0) - }, + new ItemStack[] { ItemList.Circuit_Chip_Stemcell.get(16), Materials.InfinityCatalyst.getDust(4), + ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 0) }, new FluidStack[] {}, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128), - Materials.BioMediumSterilized.getFluid(1000 * 256), - Materials.BioMediumRaw.getFluid(1000 * 512) - }, - new ItemStack[] {biocells}, - new int[] {2500, 2500, 2500, 2500}, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 128), + Materials.BioMediumSterilized.getFluid(1000 * 256), + Materials.BioMediumRaw.getFluid(1000 * 512) }, + new ItemStack[] { biocells }, + new int[] { 2500, 2500, 2500, 2500 }, 20 * 20, (int) GT_Values.VP[11], 4); @@ -296,15 +226,15 @@ public class RecipeLoader_ChemicalSkips { private static void fusionReactorRecipes() { GT_Values.RA.addFusionReactorRecipe( - new FluidStack[] {Materials.Radon.getPlasma(100), Materials.Nitrogen.getPlasma(100)}, - new FluidStack[] {new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 100)}, + new FluidStack[] { Materials.Radon.getPlasma(100), Materials.Nitrogen.getPlasma(100) }, + new FluidStack[] { new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 100) }, 30 * 20, (int) GT_Values.VP[8], 1000000000); GT_Values.RA.addFusionReactorRecipe( - new FluidStack[] {Materials.Americium.getPlasma(100), Materials.Boron.getPlasma(100)}, - new FluidStack[] {new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 100)}, + new FluidStack[] { Materials.Americium.getPlasma(100), Materials.Boron.getPlasma(100) }, + new FluidStack[] { new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 100) }, 30 * 20, (int) GT_Values.VP[8], 1000000000); @@ -312,153 +242,100 @@ public class RecipeLoader_ChemicalSkips { private static void catalystRecipes() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 88), - Materials.Osmiridium.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + GT_ModHandler.getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 88), + Materials.Osmiridium.getDust(64), Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Polybenzimidazole.getDust(64), - Materials.Polytetrafluoroethylene.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + Materials.Polybenzimidazole.getDust(64), Materials.Polytetrafluoroethylene.getDust(64), + Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mPlasticPolymerCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Silicone.getDust(64), - Materials.StyreneButadieneRubber.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Silicone.getDust(64), + Materials.StyreneButadieneRubber.getDust(64), Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mRubberPolymerCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - ALLOY.INDALLOY_140.getDust(64), - MISC_MATERIALS.ETHYL_CYANOACRYLATE.getCell(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), ALLOY.INDALLOY_140.getDust(64), + MISC_MATERIALS.ETHYL_CYANOACRYLATE.getCell(64), Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mAdhesionPromoterCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.TungstenSteel.getDust(64), - Materials.Indium.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + Materials.TungstenSteel.getDust(64), Materials.Indium.getDust(64), + Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mTitaTungstenIndiumCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - ELEMENT.getInstance().URANIUM235.getDust(64), - ELEMENT.getInstance().PLUTONIUM241.getDust(64), - Materials.Carbon.getNanite(64) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + ELEMENT.getInstance().URANIUM235.getDust(64), ELEMENT.getInstance().PLUTONIUM241.getDust(64), + Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mRadioactivityCatalyst, 1), 60 * 20, (int) GT_Values.VP[9]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Samarium.getDust(64), - Materials.Gadolinium.getDust(64), - Materials.Silver.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Samarium.getDust(64), + Materials.Gadolinium.getDust(64), Materials.Silver.getNanite(1) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216), ItemUtils.getSimpleStack(GenericChem.mRareEarthGroupCatalyst, 1), 60 * 20, (int) GT_Values.VP[10]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Naquadah.getDust(64), - Materials.Adamantium.getDust(64), - Materials.Silver.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadah.getDust(64), + Materials.Adamantium.getDust(64), Materials.Silver.getNanite(1) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(9216), ItemUtils.getSimpleStack(GenericChem.mSimpleNaquadahCatalyst, 1), 60 * 20, (int) GT_Values.VP[10]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - Materials.Naquadria.getDust(64), - Materials.Trinium.getDust(64), - Materials.Gold.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), Materials.Naquadria.getDust(64), + Materials.Trinium.getDust(64), Materials.Gold.getNanite(1) }, Materials.SpaceTime.getMolten(9216L), ItemUtils.getSimpleStack(GenericChem.mAdvancedNaquadahCatalyst, 1), 60 * 20, (int) GT_Values.VP[11]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - ItemList.Circuit_Chip_Stemcell.get(64), - Materials.Gold.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + ItemList.Circuit_Chip_Stemcell.get(64), Materials.Gold.getNanite(1) }, Materials.SpaceTime.getMolten(9216L), ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 1), 60 * 20, (int) GT_Values.VP[11]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - MaterialsKevlar.Kevlar.getDust(64), - Materials.TranscendentMetal.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), MaterialsKevlar.Kevlar.getDust(64), + Materials.TranscendentMetal.getNanite(1) }, FluidUtils.getFluidStack("molten.shirabon", 92160), ItemUtils.getSimpleStack(GenericChem.mUltimatePlasticCatalyst, 1), 60 * 20, (int) GT_Values.VP[12]); CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { - CI.getNumberedCircuit(10), - CI.getEmptyCatalyst(1), - ItemList.Circuit_Chip_Biocell.get(64), - Materials.TranscendentMetal.getNanite(1) - }, + new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), + ItemList.Circuit_Chip_Biocell.get(64), Materials.TranscendentMetal.getNanite(1) }, FluidUtils.getFluidStack("molten.shirabon", 92160), ItemUtils.getSimpleStack(GenericChem.mBiologicalIntelligenceCatalyst, 1), 60 * 20, @@ -472,20 +349,14 @@ public class RecipeLoader_ChemicalSkips { 1024, (int) GT_Values.VP[7], 32, - new ItemStack[] { - GregtechItemList.ForceFieldGlass.get(1), - Materials.Carbon.getNanite(4), - ItemList.Emitter_UV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 2) - }, - new FluidStack[] { - Materials.Thulium.getMolten(144 * 10), - Materials.ExcitedDTCC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) - }, + new ItemStack[] { GregtechItemList.ForceFieldGlass.get(1), Materials.Carbon.getNanite(4), + ItemList.Emitter_UV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), + GregtechItemList.Laser_Lens_Special.get(1), + GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 2) }, + new FluidStack[] { Materials.Thulium.getMolten(144 * 10), Materials.ExcitedDTCC.getFluid(5000), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) }, GregtechItemList.NeutronPulseManipulator.get(1), 60 * 20, (int) GT_Values.VP[10]); @@ -496,21 +367,15 @@ public class RecipeLoader_ChemicalSkips { 2048, (int) GT_Values.VP[8], 32, - new ItemStack[] { - GregtechItemList.ForceFieldGlass.get(2), - Materials.Carbon.getNanite(8), - ItemList.Emitter_UEV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 4), - ItemList.StableAdhesive.get(4) - }, - new FluidStack[] { - Materials.Thulium.getMolten(144 * 12), - Materials.ExcitedDTPC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500) - }, + new ItemStack[] { GregtechItemList.ForceFieldGlass.get(2), Materials.Carbon.getNanite(8), + ItemList.Emitter_UEV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), + GregtechItemList.Laser_Lens_Special.get(1), + GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 4), + ItemList.StableAdhesive.get(4) }, + new FluidStack[] { Materials.Thulium.getMolten(144 * 12), Materials.ExcitedDTPC.getFluid(5000), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2500) }, GregtechItemList.CosmicFabricManipulator.get(1), 75 * 20, (int) GT_Values.VP[11]); @@ -521,21 +386,15 @@ public class RecipeLoader_ChemicalSkips { 4096, (int) GT_Values.VP[7], 32, - new ItemStack[] { - GregtechItemList.ForceFieldGlass.get(4), - Materials.Carbon.getNanite(16), - ItemList.Emitter_UIV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 8), - ItemList.SuperconductorComposite.get(4) - }, - new FluidStack[] { - Materials.Thulium.getMolten(144 * 15), - Materials.ExcitedDTRC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000 * 10) - }, + new ItemStack[] { GregtechItemList.ForceFieldGlass.get(4), Materials.Carbon.getNanite(16), + ItemList.Emitter_UIV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), + GregtechItemList.Laser_Lens_Special.get(1), + GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 8), + ItemList.SuperconductorComposite.get(4) }, + new FluidStack[] { Materials.Thulium.getMolten(144 * 15), Materials.ExcitedDTRC.getFluid(5000), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 1000 * 10) }, GregtechItemList.InfinityInfusedManipulator.get(1), 90 * 20, (int) GT_Values.VP[12]); @@ -545,21 +404,15 @@ public class RecipeLoader_ChemicalSkips { 1024, (int) GT_Values.VP[7], 32, - new ItemStack[] { - GregtechItemList.ForceFieldGlass.get(8), - Materials.Carbon.getNanite(32), - ItemList.Emitter_UMV.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), - GregtechItemList.Laser_Lens_Special.get(1), - GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 16), - ItemList.NaquadriaSupersolid.get(4) - }, - new FluidStack[] { - Materials.Thulium.getMolten(144 * 20), - Materials.ExcitedDTEC.getFluid(5000), - new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), - new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2000 * 10) - }, + new ItemStack[] { GregtechItemList.ForceFieldGlass.get(8), Materials.Carbon.getNanite(32), + ItemList.Emitter_UMV.get(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), + GregtechItemList.Laser_Lens_Special.get(1), + GT_ModHandler.getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 16), + ItemList.NaquadriaSupersolid.get(4) }, + new FluidStack[] { Materials.Thulium.getMolten(144 * 20), Materials.ExcitedDTEC.getFluid(5000), + new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), + new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 2000 * 10) }, GregtechItemList.SpaceTimeContinuumRipper.get(1), 60 * 20, (int) GT_Values.VP[13]); @@ -570,16 +423,11 @@ public class RecipeLoader_ChemicalSkips { 1024, (int) GT_Values.VP[7], 32, - new ItemStack[] { - ALLOY.QUANTUM.getFrameBox(1), - GT_OreDictUnificator.get("plateDensePreciousMetalsAlloy", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16), - ItemList.Field_Generator_UV.get(1), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getScrew(16) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), - }, + new ItemStack[] { ALLOY.QUANTUM.getFrameBox(1), + GT_OreDictUnificator.get("plateDensePreciousMetalsAlloy", 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 16), + ItemList.Field_Generator_UV.get(1), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getScrew(16) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), }, GregtechItemList.NeutronShieldingCore.get(1), 60 * 20, (int) GT_Values.VP[10]); @@ -590,17 +438,13 @@ public class RecipeLoader_ChemicalSkips { 2048, (int) GT_Values.VP[8], 32, - new ItemStack[] { - ALLOY.QUANTUM.getFrameBox(2), - GT_OreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), - ItemList.Field_Generator_UEV.get(1), - GT_OreDictUnificator.get(OrePrefixes.screw, GT_CoreModSupport.RadoxPolymer, 16), - ItemList.StableAdhesive.get(4) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 20), - }, + new ItemStack[] { ALLOY.QUANTUM.getFrameBox(2), + GT_OreDictUnificator.get("plateDenseEnrichedNaquadahAlloy", 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), + ItemList.Field_Generator_UEV.get(1), + GT_OreDictUnificator.get(OrePrefixes.screw, GT_CoreModSupport.RadoxPolymer, 16), + ItemList.StableAdhesive.get(4) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 20), }, GregtechItemList.CosmicFabricShieldingCore.get(1), 75 * 20, (int) GT_Values.VP[11]); @@ -611,17 +455,11 @@ public class RecipeLoader_ChemicalSkips { 4096, (int) GT_Values.VP[9], 32, - new ItemStack[] { - ALLOY.QUANTUM.getFrameBox(4), - ELEMENT.STANDALONE.HYPOGEN.getPlateDense(4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 16), - ItemList.Field_Generator_UIV.get(1), - GT_OreDictUnificator.get("screwMetastableOganesson", 16), - ItemList.SuperconductorComposite.get(4) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), - }, + new ItemStack[] { ALLOY.QUANTUM.getFrameBox(4), ELEMENT.STANDALONE.HYPOGEN.getPlateDense(4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 16), + ItemList.Field_Generator_UIV.get(1), GT_OreDictUnificator.get("screwMetastableOganesson", 16), + ItemList.SuperconductorComposite.get(4) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 40), }, GregtechItemList.InfinityInfusedShieldingCore.get(1), 90 * 20, (int) GT_Values.VP[12]); @@ -632,28 +470,20 @@ public class RecipeLoader_ChemicalSkips { 8192, (int) GT_Values.VP[10], 32, - new ItemStack[] { - ALLOY.QUANTUM.getFrameBox(8), - GT_OreDictUnificator.get("plateDenseShirabon", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16), - ItemList.Field_Generator_UMV.get(1), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16), - ItemList.NaquadriaSupersolid.get(4) - }, - new FluidStack[] { - MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 80), - }, + new ItemStack[] { ALLOY.QUANTUM.getFrameBox(8), GT_OreDictUnificator.get("plateDenseShirabon", 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 16), + ItemList.Field_Generator_UMV.get(1), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Dilithium, 16), + ItemList.NaquadriaSupersolid.get(4) }, + new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 80), }, GregtechItemList.SpaceTimeBendingCore.get(1), 120 * 20, (int) GT_Values.VP[13]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack(QuantumGlassBlock.INSTANCE, 1), - ItemList.Field_Generator_ZPM.get(1), - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(6), - ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(6) - }, + new ItemStack[] { new ItemStack(QuantumGlassBlock.INSTANCE, 1), ItemList.Field_Generator_ZPM.get(1), + ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getLongRod(6), + ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(6) }, ALLOY.QUANTUM.getFluidStack(144 * 6), GregtechItemList.ForceFieldGlass.get(1), 10 * 20, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java index fa13b1d093..6caa976ac7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java @@ -1,14 +1,15 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gtPlusPlus.core.material.ELEMENT; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gtPlusPlus.core.material.ELEMENT; + public class RecipeLoader_GTNH { public static void generate() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java index 0ce18ad1d0..0edc2a2d00 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -18,9 +22,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.plugin.agrichem.BioRecipes; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class RecipeLoader_GlueLine { @@ -43,100 +44,82 @@ public class RecipeLoader_GlueLine { private static void chemicalPlantRecipes() { // CO + C3H6O2 = C4H6O3 CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 0)}, - new FluidStack[] { - FluidUtils.getFluidStack("carbonmonoxide", 1000), FluidUtils.getFluidStack("methylacetate", 1000), - }, + new ItemStack[] { CI.getNumberedCircuit(17), ItemUtils.getSimpleStack(GenericChem.mBlueCatalyst, 0) }, + new FluidStack[] { FluidUtils.getFluidStack("carbonmonoxide", 1000), + FluidUtils.getFluidStack("methylacetate", 1000), }, new ItemStack[] {}, - new FluidStack[] {MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)}, + new FluidStack[] { MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000) }, 10 * 20, 500, 3); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(18)}, - new FluidStack[] { - FluidUtils.getFluidStack("aceticacid", 1000), - FluidUtils.getFluidStack("chlorine", 1000), - MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000) - }, + new ItemStack[] { CI.getNumberedCircuit(18) }, + new FluidStack[] { FluidUtils.getFluidStack("aceticacid", 1000), + FluidUtils.getFluidStack("chlorine", 1000), + MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000) }, new ItemStack[] {}, - new FluidStack[] { - MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000), - MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(950) - }, + new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000), + MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(950) }, 150 * 20, 1000, 4); // Na2CO3 + NaCN + C2H3O2Cl + 2HCl = C3H3NO2 + 3NaCl + CO2 + H2O CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedCircuit(19), - ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), - MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) - }, - new FluidStack[] { - MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(1000), - FluidUtils.getFluidStack("hydrochloricacid_gt5u", 2000) - }, - new ItemStack[] {MISC_MATERIALS.CYANOACETIC_ACID.getDust(9), Materials.Salt.getDust(6)}, - new FluidStack[] {Materials.CarbonDioxide.getGas(1000), GT_ModHandler.getWater(1000)}, + new ItemStack[] { CI.getNumberedCircuit(19), + ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), + MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) }, + new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(1000), + FluidUtils.getFluidStack("hydrochloricacid_gt5u", 2000) }, + new ItemStack[] { MISC_MATERIALS.CYANOACETIC_ACID.getDust(9), Materials.Salt.getDust(6) }, + new FluidStack[] { Materials.CarbonDioxide.getGas(1000), GT_ModHandler.getWater(1000) }, 20 * 20, 1000, 4); // CuSO4 + 5C3H3NO2 + 5C2H6O = CuSO4ยท5(H2O) + 5C5H7NO2 CORE.RA.addChemicalPlantRecipe( - new ItemStack[] { - CI.getNumberedCircuit(20), - ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0), - MISC_MATERIALS.COPPER_SULFATE.getDust(6), - MISC_MATERIALS.CYANOACETIC_ACID.getDust(45) - }, - new FluidStack[] {Materials.Ethanol.getFluid(5000)}, - new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11)}, - new FluidStack[] {MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(5000)}, + new ItemStack[] { CI.getNumberedCircuit(20), + ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0), + MISC_MATERIALS.COPPER_SULFATE.getDust(6), MISC_MATERIALS.CYANOACETIC_ACID.getDust(45) }, + new FluidStack[] { Materials.Ethanol.getFluid(5000) }, + new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11) }, + new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(5000) }, 500 * 20, 6000, 5); // C3H3NO2 + C2H6O = C5H7NO2 + H2O CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(21), MISC_MATERIALS.CYANOACETIC_ACID.getDust(9)}, - new FluidStack[] {Materials.Ethanol.getFluid(1000)}, + new ItemStack[] { CI.getNumberedCircuit(21), MISC_MATERIALS.CYANOACETIC_ACID.getDust(9) }, + new FluidStack[] { Materials.Ethanol.getFluid(1000) }, new ItemStack[] {}, - new FluidStack[] {MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(1000)}, + new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(1000) }, 1000 * 20, 6000, 5); - BioRecipes.mFormaldehyde = - FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid(); + BioRecipes.mFormaldehyde = FluidUtils.getFluidStack("fluid.formaldehyde", 1).getFluid(); CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(22), ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0) - }, - new FluidStack[] { - MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100), - FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100) - }, + new ItemStack[] { CI.getNumberedCircuit(22), + ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 0) }, + new FluidStack[] { MISC_MATERIALS.ETHYL_CYANOACETATE.getFluidStack(100), + FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100) }, new ItemStack[] {}, - new FluidStack[] {MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000)}, + new FluidStack[] { MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000) }, 10 * 20, 8000, 5); // CH4 + NH3 + 3O = HCN + 3H2O CORE.RA.addChemicalPlantRecipe( - new ItemStack[] {CI.getNumberedCircuit(23), ItemUtils.getSimpleStack(GenericChem.mPinkCatalyst, 0)}, - new FluidStack[] { - FluidUtils.getFluidStack("methane", 2000), - FluidUtils.getFluidStack("ammonia", 2000), - FluidUtils.getFluidStack("oxygen", 6000) - }, + new ItemStack[] { CI.getNumberedCircuit(23), ItemUtils.getSimpleStack(GenericChem.mPinkCatalyst, 0) }, + new FluidStack[] { FluidUtils.getFluidStack("methane", 2000), FluidUtils.getFluidStack("ammonia", 2000), + FluidUtils.getFluidStack("oxygen", 6000) }, new ItemStack[] {}, - new FluidStack[] {MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000)}, + new FluidStack[] { MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000) }, 10 * 20, 500, 3); @@ -153,12 +136,11 @@ public class RecipeLoader_GlueLine { 10 * 20); // #addChemicalRecipe won't generate LCR recipe if config >= 10 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - CI.getNumberedCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3) - }, - new FluidStack[] {MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000)}, - new FluidStack[] {FluidUtils.getWater(1000)}, - new ItemStack[] {MISC_MATERIALS.SODIUM_CYANIDE.getDust(3)}, + new ItemStack[] { CI.getNumberedCircuit(17), + ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3) }, + new FluidStack[] { MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000) }, + new FluidStack[] { FluidUtils.getWater(1000) }, + new ItemStack[] { MISC_MATERIALS.SODIUM_CYANIDE.getDust(3) }, 10 * 20, 30); @@ -192,23 +174,22 @@ public class RecipeLoader_GlueLine { 5 * 20); // #addChemicalRecipe won't generate LCR recipe if config >= 10 GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {CI.getNumberedCircuit(19), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1)}, - new FluidStack[] {FluidUtils.getFluidStack("sulfuricacid", 2000)}, - new FluidStack[] {FluidUtils.getFluidStack("dilutedsulfuricacid", 1000)}, - new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE.getDust(6)}, + new ItemStack[] { CI.getNumberedCircuit(19), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1) }, + new FluidStack[] { FluidUtils.getFluidStack("sulfuricacid", 2000) }, + new FluidStack[] { FluidUtils.getFluidStack("dilutedsulfuricacid", 1000) }, + new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE.getDust(6) }, 5 * 20, 30); } private static void dehydratorRecipes() { CORE.RA.addDehydratorRecipe( - new ItemStack[] { - MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11), - }, + new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11), }, null, GT_ModHandler.getWater(5000), - new ItemStack[] {MISC_MATERIALS.COPPER_SULFATE.getDust(6)}, - new int[] {10000, 10000, 10000}, + new ItemStack[] { MISC_MATERIALS.COPPER_SULFATE.getDust(6) }, + new int[] { 10000, 10000, 10000 }, 300 * 20, 10); } @@ -216,11 +197,9 @@ public class RecipeLoader_GlueLine { private static void distillationTowerRecipes() { GT_Values.RA.addDistillationTowerRecipe( MISC_MATERIALS.CHLOROACETIC_MIXTURE.getFluidStack(1000), - new FluidStack[] { - MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(100), - MISC_MATERIALS.DICHLOROACETIC_ACID.getFluidStack(450), - MISC_MATERIALS.TRICHLOROACETIC_ACID.getFluidStack(450) - }, + new FluidStack[] { MISC_MATERIALS.CHLOROACETIC_ACID.getFluidStack(100), + MISC_MATERIALS.DICHLOROACETIC_ACID.getFluidStack(450), + MISC_MATERIALS.TRICHLOROACETIC_ACID.getFluidStack(450) }, null, 4 * 20, MaterialUtils.getVoltageForTier(5)); @@ -239,7 +218,7 @@ public class RecipeLoader_GlueLine { null, null, null, - new int[] {10000, 10000, 10000}, + new int[] { 10000, 10000, 10000 }, 20 * 30, 120); } @@ -282,11 +261,8 @@ public class RecipeLoader_GlueLine { private static void glueUsageRecipes() { // Braintech Tape recipe, PBI and superglue make 16 tape at once GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 1L), - GT_ModHandler.getIC2Item("carbonMesh", 1L), - CI.getNumberedCircuit(10) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 1L), + GT_ModHandler.getIC2Item("carbonMesh", 1L), CI.getNumberedCircuit(10) }, MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100), ItemList.Duct_Tape.get(16L), 120, @@ -294,7 +270,7 @@ public class RecipeLoader_GlueLine { // Maintenance Hatch recipe, using Braintech Tape GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(1), CI.getNumberedCircuit(1)}, + new ItemStack[] { ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(1), CI.getNumberedCircuit(1) }, MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100), ItemList.Hatch_Maintenance.get(1), 120, @@ -302,22 +278,16 @@ public class RecipeLoader_GlueLine { // Graphene recipes from later wafer tiers, using superglue instead of the bronze age glue GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 64), - ItemList.Circuit_Silicon_Wafer4.get(2L), - CI.getNumberedCircuit(2) - }, + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOre