From 6dc92bfe1dad0eb4928ec9ffdf5bb98cb746605e Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 23 Sep 2023 02:03:14 +0900 Subject: Cleanup noXXXYYY methods (#361) Former-commit-id: e5a4c18be25612616e4b6d9112802fb964ef3dbf --- .../bartworks/API/BioObjectAdder.java | 2 +- .../common/loaders/ArtificialMicaLine.java | 20 ++-- .../bartworks/common/loaders/FluidLoader.java | 2 +- .../common/loaders/recipes/Assembler.java | 50 ++++----- .../common/loaders/recipes/AssemblyLine.java | 10 +- .../common/loaders/recipes/Autoclave.java | 8 +- .../common/loaders/recipes/Centrifuge.java | 31 +++--- .../common/loaders/recipes/ChemicalBath.java | 28 ++--- .../common/loaders/recipes/ChemicalReactor.java | 2 +- .../common/loaders/recipes/Electrolyzer.java | 36 +++--- .../common/loaders/recipes/Extractor.java | 8 +- .../common/loaders/recipes/FluidHeater.java | 2 +- .../common/loaders/recipes/FluidSolidifier.java | 36 +++--- .../common/loaders/recipes/FormingPress.java | 18 +-- .../common/loaders/recipes/LaserEngraver.java | 3 +- .../bartworks/common/loaders/recipes/Mixer.java | 8 +- .../common/loaders/recipes/Pulverizer.java | 37 +++---- .../system/material/BW_MetaGeneratedFrames.java | 3 +- .../material/CircuitGeneration/BW_Meta_Items.java | 4 +- .../CircuitGeneration/CircuitPartLoader.java | 4 +- .../GT_Enhancement/GTMetaItemEnhancer.java | 13 +-- .../GT_Enhancement/PlatinumSludgeOverHaul.java | 123 ++++++++++----------- .../material/processingLoaders/AddSomeRecipes.java | 10 +- .../processingLoaders/AdditionalRecipes.java | 16 +-- .../werkstoff_loaders/recipe/BlockLoader.java | 11 +- .../werkstoff_loaders/recipe/CasingLoader.java | 8 +- .../werkstoff_loaders/recipe/CellLoader.java | 16 ++- .../recipe/CraftingMaterialLoader.java | 58 +++++----- .../werkstoff_loaders/recipe/CrushedLoader.java | 30 +++-- .../werkstoff_loaders/recipe/DustLoader.java | 26 ++--- .../werkstoff_loaders/recipe/GemLoader.java | 75 +++++++------ .../werkstoff_loaders/recipe/MetalLoader.java | 5 +- .../werkstoff_loaders/recipe/MoltenCellLoader.java | 71 ++++++------ .../recipe/MultipleMetalLoader.java | 2 +- .../werkstoff_loaders/recipe/OreLoader.java | 2 +- .../recipe/SimpleMetalLoader.java | 37 +++---- .../werkstoff_loaders/recipe/ToolLoader.java | 18 ++- 37 files changed, 390 insertions(+), 443 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java index bd336c265f..f13035b5c9 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java @@ -178,7 +178,7 @@ public final class BioObjectAdder { new Exception("FAILED TO REGISTER FLUID FOR: " + B.getName()).printStackTrace(); } - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) .fluidInputs(new FluidStack(B.getFluid(), 1000)).fluidOutputs(dnaFluid).duration(25 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java index 97133ccec5..ea533e4b4b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java @@ -31,8 +31,7 @@ public class ArtificialMicaLine { // Mg + O = MgO GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesium.getDust(1)).itemOutputs(Materials.Magnesia.getDust(2)) - .fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs().duration(2 * SECONDS).eut(8) - .addTo(UniversalChemical); + .fluidInputs(Materials.Oxygen.getGas(1000)).duration(2 * SECONDS).eut(8).addTo(UniversalChemical); // Si + 6HF = H2SiF6 + 4H GT_Values.RA.stdBuilder().itemInputs(Materials.Silicon.getDust(1), Materials.Empty.getCells(4)) @@ -43,7 +42,7 @@ public class ArtificialMicaLine { GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(Materials.RockSalt.getDust(2)).fluidInputs(Materials.Chlorine.getGas(1000)) - .noFluidOutputs().duration(20 * TICKS).eut(8).addTo(UniversalChemical); + .duration(20 * TICKS).eut(8).addTo(UniversalChemical); // 2KCl + H2SiF6 = 2HCl + K2SiF6 GT_Values.RA.stdBuilder().itemInputs(Materials.RockSalt.getDust(4)) @@ -56,13 +55,12 @@ public class ArtificialMicaLine { GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(2), Materials.CarbonDioxide.getCells(1)) .itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs().duration(2 * SECONDS).eut(8) - .addTo(UniversalChemical); + .fluidInputs(Materials.Oxygen.getGas(1000)).duration(2 * SECONDS).eut(8).addTo(UniversalChemical); // K2O + CO2 = K2CO3 GT_Values.RA.stdBuilder().itemInputs(Materials.Potash.getDust(3), Materials.CarbonDioxide.getCells(1)) .itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(8).addTo(UniversalChemical); + .duration(2 * SECONDS).eut(8).addTo(UniversalChemical); // 55Quartz Dust + 20K2SiF6 + 12Al2O3 + 4K2CO3 = 91Raw Fluorophlogopite Dust GT_Values.RA.stdBuilder() @@ -75,7 +73,7 @@ public class ArtificialMicaLine { .itemOutputs( WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); // 55Quartzite/Nether Quartz Dust + 20K2SiF6 + 57Al2O3 + 4K2CO3 = 136Raw Fluorophlogopite Dust GT_Values.RA.stdBuilder() @@ -102,7 +100,7 @@ public class ArtificialMicaLine { WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8)) - .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); // 62Certus Quartz Dust + 10K2SiF6 + 12Al2O3 + 7K2CO3 = 91Raw Fluorophlogopite Dust GT_Values.RA.stdBuilder() @@ -115,11 +113,11 @@ public class ArtificialMicaLine { .itemOutputs( WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) - .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); // MgO(s) = MgO(l) - GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesia.getDust(1)).noItemOutputs().noFluidInputs() + GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesia.getDust(1)) .fluidOutputs(Materials.Magnesia.getMolten(144)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) .addTo(sFluidExtractionRecipes); @@ -150,7 +148,7 @@ public class ArtificialMicaLine { WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4)) - .noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(600).addTo(sBenderRecipes); + .duration(10 * TICKS).eut(600).addTo(sBenderRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java index 017dba8358..418a299f5c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java @@ -97,7 +97,7 @@ public class FluidLoader { GT_LanguageManager .addStringLocalization(B.getFluid().getUnlocalizedName(), B.getLocalisedName() + " Fluid"); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) .fluidInputs(new FluidStack(B.getFluid(), 1000)).fluidOutputs(dnaFluid).duration(25 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java index ed29a3a7f0..833c3c647a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java @@ -46,7 +46,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1)) - .fluidInputs(FluidRegistry.getFluidStack("ic2coolant", 1000)).noFluidOutputs().duration(5 * SECONDS) + .fluidInputs(FluidRegistry.getFluidStack("ic2coolant", 1000)).duration(5 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() @@ -54,51 +54,51 @@ public class Assembler implements Runnable { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), Materials.Lapis.getBlocks(8), GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[1])).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[1])).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1000), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(ItemRegistry.megaMachines[0]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1002), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(ItemRegistry.megaMachines[1]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1126), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(ItemRegistry.megaMachines[2]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1169), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(ItemRegistry.megaMachines[3]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1160), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(ItemRegistry.megaMachines[4]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) - .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[2], 1, 1)) - .fluidInputs(Materials.Plastic.getMolten(1152L)).noFluidOutputs().duration(1 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Plastic.getMolten(1152L)).duration(1 * TICKS).eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -107,8 +107,8 @@ public class Assembler implements Runnable { ItemList.Circuit_Board_Plastic.get(1L), ItemList.Battery_RE_LV_Lithium.get(1L)) .itemOutputs(new ItemStack(ItemRegistry.CIRCUIT_PROGRAMMER)) - .fluidInputs(Materials.SolderingAlloy.getMolten(288L)).noFluidOutputs().duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.SolderingAlloy.getMolten(288L)).duration(30 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -120,7 +120,7 @@ public class Assembler implements Runnable { ItemRegistry.TecTechPipeEnergyLowPower.getItem(), 1, ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage())) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(72)).noFluidOutputs().duration(10 * SECONDS) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(72)).duration(10 * SECONDS) .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); ItemStack[][] converters = ItemRegistry.TecTechLaserAdditions[0]; @@ -171,7 +171,7 @@ public class Assembler implements Runnable { emitters[i].get(2 * (j + 1)), sensors[i].get(2 * (j + 1)), ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1))).itemOutputs(converter) - .fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)).noFluidOutputs() + .fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) .duration((10 * (j + 1)) * SECONDS).eut(recipeConsumption).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() @@ -185,8 +185,7 @@ public class Assembler implements Runnable { sensors[i].get(2 * (j + 1)), ItemList.HATCHES_ENERGY[4 + i].get(2 * (j + 1))) .itemOutputs(eInput).fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) - .noFluidOutputs().duration((10 * (j + 1)) * SECONDS).eut(recipeConsumption) - .addTo(sAssemblerRecipes); + .duration((10 * (j + 1)) * SECONDS).eut(recipeConsumption).addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -199,8 +198,7 @@ public class Assembler implements Runnable { emitters[i].get(2 * (j + 1)), ItemList.HATCHES_DYNAMO[4 + i].get(2 * (j + 1))) .itemOutputs(eDynamo).fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) - .noFluidOutputs().duration((10 * (j + 1) * SECONDS)).eut(recipeConsumption) - .addTo(sAssemblerRecipes); + .duration((10 * (j + 1) * SECONDS)).eut(recipeConsumption).addTo(sAssemblerRecipes); } } @@ -209,20 +207,20 @@ public class Assembler implements Runnable { ItemList.Hatch_Input_HV.get(64), Materials.LiquidAir.getCells(1), GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.compressedHatch.copy()).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemRegistry.compressedHatch.copy()).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder().itemInputs(ItemList.Hatch_Output_HV.get(64), GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(ItemRegistry.giantOutputHatch.copy()).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemRegistry.giantOutputHatch.copy()).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 6), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) .itemOutputs(new ItemStack(GregTech_API.sBlockCasings3, 1, 12)) - .fluidInputs(Materials.Concrete.getMolten(1296)).noFluidOutputs().duration(2 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Concrete.getMolten(1296)).duration(2 * SECONDS).eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -230,7 +228,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 6), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 24)) .itemOutputs(new ItemStack(GregTech_API.sBlockCasings8, 1, 5)) - .fluidInputs(Materials.Lead.getMolten(864)).noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Lead.getMolten(864)).duration(10 * SECONDS).eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java index 860204d4a7..61d531de0b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java @@ -39,8 +39,8 @@ public class AssemblyLine implements Runnable { .fluidInputs( new FluidStack(solderIndalloy, 32 * 144), Materials.Polytetrafluoroethylene.getMolten(32 * 144)) - .noFluidOutputs().itemOutputs(ItemRegistry.dehp).eut(TierEU.RECIPE_LuV) - .duration(4 * MINUTES + 10 * SECONDS).addTo(AssemblyLine); + .itemOutputs(ItemRegistry.dehp).eut(TierEU.RECIPE_LuV).duration(4 * MINUTES + 10 * SECONDS) + .addTo(AssemblyLine); if (GalactiGreg.isModLoaded()) { GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.OreDrill4.get(1L)) @@ -54,8 +54,8 @@ public class AssemblyLine implements Runnable { ItemList.Field_Generator_LuV.get(9L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L)) .fluidInputs(new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Neon.getFluidOrGas(20000)) - .noFluidOutputs().itemOutputs(ItemRegistry.voidminer[0].copy()).eut(TierEU.RECIPE_LuV) - .duration(5 * MINUTES).addTo(AssemblyLine); + .itemOutputs(ItemRegistry.voidminer[0].copy()).eut(TierEU.RECIPE_LuV).duration(5 * MINUTES) + .addTo(AssemblyLine); } GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Machine_LuV_CircuitAssembler.get(1L)) @@ -68,7 +68,7 @@ public class AssemblyLine implements Runnable { ItemList.Emitter_LuV.get(1L), ItemList.Sensor_LuV.get(1L), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 8)) - .fluidInputs(new FluidStack(solderIndalloy, 1440)).noFluidOutputs().itemOutputs(ItemRegistry.cal.copy()) + .fluidInputs(new FluidStack(solderIndalloy, 1440)).itemOutputs(ItemRegistry.cal.copy()) .eut(TierEU.RECIPE_LuV).duration(20 * MINUTES).addTo(AssemblyLine); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java index 7d32af49a6..b8f6c51b6c 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java @@ -22,13 +22,13 @@ public class Autoclave implements Runnable { GT_Values.RA.stdBuilder().itemInputs(ItemList.Circuit_Parts_PetriDish.get(1L)) .itemOutputs(BioItemList.getPetriDish(null)) - .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)).noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); + .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.glass_bottle)) .itemOutputs(BioItemList.getDNASampleFlask(null)) - .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)).noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); + .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java index a20a3e4d82..adb84fd8a0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java @@ -36,8 +36,8 @@ public class Centrifuge implements Runnable { WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1), WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1)) - .outputChances(800, 375, 22, 22, 5).noFluidInputs().noFluidOutputs() - .duration(8 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sCentrifugeRecipes); + .outputChances(800, 375, 22, 22, 5).duration(8 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_EV) + .addTo(sCentrifugeRecipes); ItemStack[] pellets = new ItemStack[6]; Arrays.fill(pellets, new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 4)); @@ -46,19 +46,18 @@ public class Centrifuge implements Runnable { .itemInputs( new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3), GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(pellets).noFluidInputs().noFluidOutputs().duration(40 * MINUTES).eut(TierEU.RECIPE_LV) - .addTo(sCentrifugeRecipes); + .itemOutputs(pellets).duration(40 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 5), GT_Utility.getIntegratedCircuit(17)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 6)).noFluidInputs() - .noFluidOutputs().duration(40 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes); + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 64, 6)) + .duration(40 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 6)) - .itemOutputs(Materials.Lead.getDust(1)).outputChances(300).noFluidInputs().noFluidOutputs() - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes); + .itemOutputs(Materials.Lead.getDust(1)).outputChances(300).duration(60 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sCentrifugeRecipes); int i = 0; for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { @@ -72,16 +71,14 @@ public class Centrifuge implements Runnable { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4), new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 4)) - .noFluidInputs().noFluidOutputs().duration(10 * MINUTES).eut(TierEU.RECIPE_LV) - .addTo(sCentrifugeRecipes); + .duration(10 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 5), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 64, i + 6)) - .noFluidInputs().noFluidOutputs().duration(2 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sCentrifugeRecipes); + .duration(2 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes); GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 6)) @@ -91,10 +88,8 @@ public class Centrifuge implements Runnable { fuel.recycledItems[2], fuel.recycledItems[3], fuel.recycledItems[4]) - .outputChances(fuel.recycleChances).noFluidInputs(); - if (fuel.recycledFluid == null) { - recipeBuilder.noFluidOutputs(); - } else { + .outputChances(fuel.recycleChances); + if (fuel.recycledFluid != null) { recipeBuilder.fluidOutputs(fuel.recycledFluid); } recipeBuilder.duration(1 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes); @@ -107,12 +102,12 @@ public class Centrifuge implements Runnable { .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[1], 10)).duration(60 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(17)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(17)) .fluidInputs(new FluidStack(FluidLoader.BioLabFluidMaterials[1], 1000)) .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[3], 250)).duration(60 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(17)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(17)) .fluidInputs(new FluidStack(BioCultureLoader.CommonYeast.getFluid(), 1000)) .fluidOutputs(new FluidStack(FluidLoader.BioLabFluidMaterials[2], 10)).duration(60 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(sCentrifugeRecipes); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java index b2e8e59868..47fc76767a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalBath.java @@ -21,33 +21,33 @@ public class ChemicalBath implements Runnable { GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 6)) - .fluidInputs(Dyes.dyeRed.getFluidDye(i, 36)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(2).addTo(sChemicalBathRecipes); + .fluidInputs(Dyes.dyeRed.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) + .addTo(sChemicalBathRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 7)) - .fluidInputs(Dyes.dyeGreen.getFluidDye(i, 36)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(2).addTo(sChemicalBathRecipes); + .fluidInputs(Dyes.dyeGreen.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) + .addTo(sChemicalBathRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 8)) - .fluidInputs(Dyes.dyePurple.getFluidDye(i, 36)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(2).addTo(sChemicalBathRecipes); + .fluidInputs(Dyes.dyePurple.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) + .addTo(sChemicalBathRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 9)) - .fluidInputs(Dyes.dyeYellow.getFluidDye(i, 36)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(2).addTo(sChemicalBathRecipes); + .fluidInputs(Dyes.dyeYellow.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) + .addTo(sChemicalBathRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 10)) - .fluidInputs(Dyes.dyeLime.getFluidDye(i, 36)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(2).addTo(sChemicalBathRecipes); + .fluidInputs(Dyes.dyeLime.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) + .addTo(sChemicalBathRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 11)) - .fluidInputs(Dyes.dyeBrown.getFluidDye(i, 36)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(2).addTo(sChemicalBathRecipes); + .fluidInputs(Dyes.dyeBrown.getFluidDye(i, 36)).duration(3 * SECONDS + 4 * TICKS).eut(2) + .addTo(sChemicalBathRecipes); } @@ -55,8 +55,8 @@ public class ChemicalBath implements Runnable { GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, i)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) - .fluidInputs(Materials.Chlorine.getGas(50)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(2).addTo(sChemicalBathRecipes); + .fluidInputs(Materials.Chlorine.getGas(50)).duration(3 * SECONDS + 4 * TICKS).eut(2) + .addTo(sChemicalBathRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java index 01d6e05c5b..e71a8b863f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/ChemicalReactor.java @@ -17,7 +17,7 @@ public class ChemicalReactor implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) .fluidInputs(new FluidStack(FluidLoader.heatedfulvicAcid, 1000)) .fluidOutputs(new FluidStack(FluidLoader.Kerogen, 1000)).duration(3 * SECONDS + 15 * TICKS) .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java index 18e0138043..b82e06a9e4 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Electrolyzer.java @@ -23,35 +23,35 @@ public class Electrolyzer implements Runnable { .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(10 * SECONDS).eut(90) + .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(10 * SECONDS).eut(90) .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 6)) .itemOutputs( WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(12 * SECONDS + 10 * TICKS) - .eut(90).addTo(sElectrolyzerRecipes); + .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(12 * SECONDS + 10 * TICKS).eut(90) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.Fayalit.get(OrePrefixes.dust, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(16 * SECONDS).eut(90) + .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(16 * SECONDS).eut(90) .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.Prasiolite.get(OrePrefixes.dust, 16)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 5L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)) - .noFluidInputs().noFluidOutputs().duration(29 * SECONDS).eut(90).addTo(sElectrolyzerRecipes); + .duration(29 * SECONDS).eut(90).addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.Hedenbergit.get(OrePrefixes.dust, 10)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 2L)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(15 * SECONDS).eut(90) + .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(15 * SECONDS).eut(90) .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() @@ -61,8 +61,8 @@ public class Electrolyzer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(19 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(19 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(WerkstoffLoader.FuchsitCR.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2)) @@ -71,8 +71,8 @@ public class Electrolyzer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(23 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + .fluidOutputs(Materials.Oxygen.getGas(2000L)).duration(23 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(WerkstoffLoader.VanadioOxyDravit.get(OrePrefixes.dust, 53), ItemList.Cell_Empty.get(3)) @@ -83,8 +83,8 @@ public class Electrolyzer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(19000L)).duration(35 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + .fluidOutputs(Materials.Oxygen.getGas(19000L)).duration(35 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -97,8 +97,8 @@ public class Electrolyzer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(19000L)).duration(36 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + .fluidOutputs(Materials.Oxygen.getGas(19000L)).duration(36 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(WerkstoffLoader.FluorBuergerit.get(OrePrefixes.dust, 50), ItemList.Cell_Empty.get(3)) @@ -109,8 +109,8 @@ public class Electrolyzer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 3)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(6000L)).duration(36 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + .fluidOutputs(Materials.Oxygen.getGas(6000L)).duration(36 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() .itemInputs(WerkstoffLoader.Olenit.get(OrePrefixes.dust, 51), ItemList.Cell_Empty.get(1)) @@ -120,8 +120,8 @@ public class Electrolyzer implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1)) - .noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(1000L)).duration(39 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + .fluidOutputs(Materials.Oxygen.getGas(1000L)).duration(39 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java index a87b71f8aa..c1b2a4ba25 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Extractor.java @@ -25,15 +25,15 @@ public class Extractor implements Runnable { for (ItemStack stack : oreCropVine) { GT_Values.RA.stdBuilder().itemInputs(BW_Util.setStackSize(stack, 12)) - .itemOutputs(BioItemList.getOther(1)).noFluidInputs().noFluidOutputs().duration(25 * SECONDS) - .eut((int) TierEU.RECIPE_HV).addTo(sExtractorRecipes); + .itemOutputs(BioItemList.getOther(1)).duration(25 * SECONDS).eut((int) TierEU.RECIPE_HV) + .addTo(sExtractorRecipes); } } GT_Values.RA.stdBuilder().itemInputs(ItemList.Circuit_Chip_Stemcell.get(1L)) - .itemOutputs(BioItemList.getOther(4)).noFluidInputs().noFluidOutputs().duration(25 * SECONDS) - .eut((int) TierEU.RECIPE_LuV).addTo(sExtractorRecipes); + .itemOutputs(BioItemList.getOther(4)).duration(25 * SECONDS).eut((int) TierEU.RECIPE_LuV) + .addTo(sExtractorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java index d2125aac22..e1eaa07400 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidHeater.java @@ -16,7 +16,7 @@ public class FluidHeater implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)).noItemOutputs() + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) .fluidInputs(new FluidStack(FluidLoader.fulvicAcid, 1000)) .fluidOutputs(new FluidStack(FluidLoader.heatedfulvicAcid, 1000)).duration(4 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV).addTo(sFluidHeaterRecipes); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java index 5c5271f2b7..d9939ac3b2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java @@ -21,52 +21,52 @@ public class FluidSolidifier implements Runnable { GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lapis_block)) .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0)) - .fluidInputs(Materials.Iron.getMolten(1296L)).noFluidOutputs().duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidSolidficationRecipes); + .fluidInputs(Materials.Iron.getMolten(1296L)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1)) - .fluidInputs(Materials.Titanium.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidSolidficationRecipes); + .fluidInputs(Materials.Titanium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2)) - .fluidInputs(Materials.TungstenSteel.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidSolidficationRecipes); + .fluidInputs(Materials.TungstenSteel.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_EV) + .addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3)) - .fluidInputs(WerkstoffLoader.LuVTierMaterial.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) + .fluidInputs(WerkstoffLoader.LuVTierMaterial.getMolten(1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_IV).addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 4)) - .fluidInputs(Materials.Iridium.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sFluidSolidficationRecipes); + .fluidInputs(Materials.Iridium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_LuV) + .addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 5)) - .fluidInputs(Materials.Osmium.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_ZPM).addTo(sFluidSolidficationRecipes); + .fluidInputs(Materials.Osmium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_ZPM) + .addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13)) - .fluidInputs(Materials.Neutronium.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(sFluidSolidficationRecipes); + .fluidInputs(Materials.Neutronium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_UV) + .addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 14)) - .fluidInputs(Materials.CosmicNeutronium.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_UHV).addTo(sFluidSolidficationRecipes); + .fluidInputs(Materials.CosmicNeutronium.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_UHV) + .addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 15)) - .fluidInputs(Materials.Infinity.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_UEV).addTo(sFluidSolidficationRecipes); + .fluidInputs(Materials.Infinity.getMolten(1152)).duration(40 * SECONDS).eut(TierEU.RECIPE_UEV) + .addTo(sFluidSolidficationRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 0)) .itemOutputs(new ItemStack(ItemRegistry.bw_glasses[1], 1, 0)) - .fluidInputs(MaterialsUEVplus.TranscendentMetal.getMolten(1152)).noFluidOutputs().duration(40 * SECONDS) + .fluidInputs(MaterialsUEVplus.TranscendentMetal.getMolten(1152)).duration(40 * SECONDS) .eut(TierEU.RECIPE_UIV).addTo(sFluidSolidficationRecipes); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java index 4523503c87..f24e71fb99 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FormingPress.java @@ -22,22 +22,22 @@ public class FormingPress implements Runnable { .itemInputs( new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials), Materials.Graphite.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1)).noFluidInputs() - .noFluidOutputs().duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1)) + .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 1), Materials.Silicon.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2)).noFluidInputs() - .noFluidOutputs().duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2)) + .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 2), Materials.Graphite.getDust(64)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3)).noFluidInputs() - .noFluidOutputs().duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials, 1, 3)) + .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); int i = 0; for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { @@ -46,21 +46,21 @@ public class FormingPress implements Runnable { new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i), Materials.Carbon.getDust(64)) .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); + .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 1), Materials.Silicon.getDust(64)) .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); + .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 2), Materials.Graphite.getDust(64)) .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 3)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); + .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sPressRecipes); i += MATERIALS_PER_FUEL; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java index 2d6f80ac9a..3e01bfb7be 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/LaserEngraver.java @@ -16,8 +16,7 @@ public class LaserEngraver implements Runnable { public void run() { GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.emerald), GT_Utility.getIntegratedCircuit(17)) - .noItemOutputs().noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sLaserEngraverRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sLaserEngraverRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java index 4810a396ae..e6ea24dc8b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Mixer.java @@ -31,14 +31,14 @@ public class Mixer implements Runnable { WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 10), Materials.Uranium235.getDust(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials)).noFluidInputs() - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sMixerRecipes); + .itemOutputs(new ItemStack(GT_TileEntity_THTR.THTRMaterials.aTHTR_Materials)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(sMixerRecipes); int i = 0; for (GT_TileEntity_HTGR.HTGRMaterials.Fuel_ fuel : sHTGR_Fuel) { GT_Values.RA.stdBuilder().itemInputs(fuel.mainItem, fuel.secondaryItem, GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i)).noFluidInputs() - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sMixerRecipes); + .itemOutputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i)) + .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sMixerRecipes); i += MATERIALS_PER_FUEL; } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java index dea39b0088..8dd55d5f24 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java @@ -20,51 +20,48 @@ public class Pulverizer implements Runnable { public void run() { GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 1)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Titanium.getDust(8)).noFluidInputs() - .noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMaceratorRecipes); + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Titanium.getDust(8)) + .duration(40 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 2)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.TungstenSteel.getDust(8)).noFluidInputs() - .noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sMaceratorRecipes); + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.TungstenSteel.getDust(8)) + .duration(40 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 3)) .itemOutputs( Materials.BorosilicateGlass.getDust(9), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.dust, 8)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_LuV) - .addTo(sMaceratorRecipes); + .duration(40 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 4)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Iridium.getDust(8)).noFluidInputs() - .noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sMaceratorRecipes); + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Iridium.getDust(8)) + .duration(40 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 5)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Osmium.getDust(8)).noFluidInputs() - .noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sMaceratorRecipes); + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Osmium.getDust(8)).duration(40 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 13)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Neutronium.getDust(8)).noFluidInputs() - .noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sMaceratorRecipes); + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Neutronium.getDust(8)) + .duration(40 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 14)) .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.CosmicNeutronium.getDust(8)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_UEV) - .addTo(sMaceratorRecipes); + .duration(40 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, 15)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Infinity.getDust(8)).noFluidInputs() - .noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(sMaceratorRecipes); + .itemOutputs(Materials.BorosilicateGlass.getDust(9), Materials.Infinity.getDust(8)) + .duration(40 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[1], 1, 0)) .itemOutputs(Materials.BorosilicateGlass.getDust(9), MaterialsUEVplus.TranscendentMetal.getDust(8)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_UMV) - .addTo(sMaceratorRecipes); + .duration(40 * SECONDS).eut(TierEU.RECIPE_UMV).addTo(sMaceratorRecipes); for (int i = 6; i < 11; i++) { GT_Values.RA.stdBuilder().itemInputs(new ItemStack(ItemRegistry.bw_glasses[0], 1, i)) - .itemOutputs(Materials.BorosilicateGlass.getDust(9)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sMaceratorRecipes); + .itemOutputs(Materials.BorosilicateGlass.getDust(9)).duration(20 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sMaceratorRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java index 4b5802d5e0..cb876af9bc 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedFrames.java @@ -52,8 +52,7 @@ public class BW_MetaGeneratedFrames extends MetaPipeEntity {