diff options
author | miozune <miozune@gmail.com> | 2023-09-23 15:45:01 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-23 15:45:01 +0900 |
commit | ed6a15a45c82b833029970a46172b1dc4056c2c2 (patch) | |
tree | e4e15411e2c86d51fd0862a1ab33aeb7967f41b5 /src | |
parent | 0b64da21122c2671e943131ce60e5b45d2759a2e (diff) | |
download | GT5-Unofficial-ed6a15a45c82b833029970a46172b1dc4056c2c2.tar.gz GT5-Unofficial-ed6a15a45c82b833029970a46172b1dc4056c2c2.tar.bz2 GT5-Unofficial-ed6a15a45c82b833029970a46172b1dc4056c2c2.zip |
Cleanup noXXXYYY methods (#77)
* updateBuildScript
* Update dependencies
* Cleanup noXXXYYY methods
* Fix wildcard import
Diffstat (limited to 'src')
8 files changed, 91 insertions, 92 deletions
diff --git a/src/main/java/common/recipeLoaders/AlloySmelter.java b/src/main/java/common/recipeLoaders/AlloySmelter.java index 33bf414767..89cfcff35c 100644 --- a/src/main/java/common/recipeLoaders/AlloySmelter.java +++ b/src/main/java/common/recipeLoaders/AlloySmelter.java @@ -24,8 +24,7 @@ public class AlloySmelter implements Runnable { craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 3), ItemList.Shape_Mold_Plate.get(0)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sAlloySmelterRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAlloySmelterRecipes); } } } diff --git a/src/main/java/common/recipeLoaders/Assembler.java b/src/main/java/common/recipeLoaders/Assembler.java index 5e91988d11..b4138424f5 100644 --- a/src/main/java/common/recipeLoaders/Assembler.java +++ b/src/main/java/common/recipeLoaders/Assembler.java @@ -12,7 +12,12 @@ import common.TileEntities; import common.items.ErrorItem; import common.items.MetaItem_CraftingComponent; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -31,7 +36,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DarkSteel, 3), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 3)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144)).noFluidOutputs().duration(5 * SECONDS) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144)).duration(5 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFT Multi Hatch @@ -42,7 +47,7 @@ public class Assembler implements Runnable { ItemList.Field_Generator_LV.get(4), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 25)) .itemOutputs(TileEntities.tfftHatch.getStackForm(1)).fluidInputs(Materials.Plastic.getMolten(432)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFTStorageField1 GT_Values.RA.stdBuilder() @@ -53,7 +58,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Steel, 3), ItemList.FluidRegulator_LV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 1)).fluidInputs(Materials.Glass.getMolten(144)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFTStorageField2 GT_Values.RA.stdBuilder() @@ -64,7 +69,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Plastic, 3), ItemList.FluidRegulator_MV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 2)).fluidInputs(Materials.Plastic.getMolten(288)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFTStorageField3 GT_Values.RA.stdBuilder() @@ -76,7 +81,7 @@ public class Assembler implements Runnable { ItemList.Field_Generator_LV.get(1), ItemList.FluidRegulator_HV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 3)).fluidInputs(Materials.Plastic.getMolten(432)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // TFFTStorageField4 GT_Values.RA.stdBuilder() @@ -88,7 +93,7 @@ public class Assembler implements Runnable { ItemList.Field_Generator_MV.get(2), ItemList.FluidRegulator_EV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 4)).fluidInputs(Materials.Epoxid.getMolten(864)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); // TFFTStorageField5 GT_Values.RA.stdBuilder() @@ -100,7 +105,7 @@ public class Assembler implements Runnable { ItemList.Field_Generator_HV.get(4), ItemList.FluidRegulator_IV.get(1)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 5)).fluidInputs(Materials.Epoxid.getMolten(1152)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); // LSC Casing GT_Values.RA.stdBuilder() @@ -109,8 +114,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lapis, 1)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // EV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -118,8 +123,8 @@ public class Assembler implements Runnable { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6), GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), GT_Utility.getIntegratedCircuit(7)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // IV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -127,8 +132,8 @@ public class Assembler implements Runnable { new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6), ItemList.Energy_LapotronicOrb.get(1L), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); // LuV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -137,8 +142,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)).duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); // ZPM Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -147,8 +152,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)).noFluidInputs().noFluidOutputs() - .duration(1 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)).duration(1 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); // UV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -157,8 +162,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)).noFluidInputs().noFluidOutputs() - .duration(2 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)).duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); // UHV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -167,8 +172,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5)).noFluidInputs().noFluidOutputs() - .duration(5 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5)).duration(5 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); // UEV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -177,8 +182,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8)).noFluidInputs().noFluidOutputs() - .duration(10 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8)).duration(10 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); // UIV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -187,8 +192,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9)).noFluidInputs().noFluidOutputs() - .duration(10 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9)).duration(10 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UEV).addTo(sAssemblerRecipes); // UMV Capacitor alt recipe GT_Values.RA.stdBuilder() @@ -197,8 +202,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10)).noFluidInputs().noFluidOutputs() - .duration(10 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10)).duration(10 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UIV).addTo(sAssemblerRecipes); final MetaItem_CraftingComponent craftingItem = MetaItem_CraftingComponent.getInstance(); @@ -212,7 +217,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1), ItemList.Electric_Motor_HV.get(1L)) .itemOutputs(new ItemStack(Blocks.yszUnit, 1)).fluidInputs(Materials.Hydrogen.getGas(4000)) - .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); // GDC Unit GT_Values.RA.stdBuilder().itemInputs( @@ -223,8 +228,8 @@ public class Assembler implements Runnable { GT_OreDictUnificator .get(OrePrefixes.rotor, Materials.Desh, new ItemStack(ErrorItem.getInstance(), 1), 1), ItemList.Electric_Motor_IV.get(1L)).itemOutputs(new ItemStack(Blocks.gdcUnit, 1)) - .fluidInputs(Materials.Hydrogen.getGas(16000)).noFluidOutputs().duration(2 * MINUTES) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .fluidInputs(Materials.Hydrogen.getGas(16000)).duration(2 * MINUTES).eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); // Hex Tiles GT_Values.RA.stdBuilder() @@ -234,7 +239,7 @@ public class Assembler implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.DarkSteel, 2)) .itemOutputs(new ItemStack(Blocks.largeHexPlate, 2)) - .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 36)).noFluidOutputs().duration(30 * SECONDS) + .fluidInputs(FluidRegistry.getFluidStack("molten.plastic", 36)).duration(30 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); } diff --git a/src/main/java/common/recipeLoaders/AssemblyLine.java b/src/main/java/common/recipeLoaders/AssemblyLine.java index 6e84e0c0d3..140675f467 100644 --- a/src/main/java/common/recipeLoaders/AssemblyLine.java +++ b/src/main/java/common/recipeLoaders/AssemblyLine.java @@ -21,7 +21,12 @@ import net.minecraftforge.fluids.FluidStack; import common.Blocks; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -50,8 +55,8 @@ public class AssemblyLine implements Runnable { ItemList.FluidRegulator_LuV.get(1), GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 4)) .fluidInputs(Materials.Enderium.getMolten(1440), Materials.Polybenzimidazole.getMolten(1584)) - .noFluidOutputs().itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 6)).eut(TierEU.RECIPE_LuV) - .duration(30 * SECONDS).addTo(AssemblyLine); + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 6)).eut(TierEU.RECIPE_LuV).duration(30 * SECONDS) + .addTo(AssemblyLine); // TFFTStorageField7 GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 6)) @@ -68,8 +73,8 @@ public class AssemblyLine implements Runnable { GT_ModHandler .getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 16)) .fluidInputs(Materials.CrystallineAlloy.getMolten(2880), Materials.Polybenzimidazole.getMolten(2016)) - .noFluidOutputs().itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 7)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(AssemblyLine); + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 7)).duration(30 * SECONDS).eut(TierEU.RECIPE_UV) + .addTo(AssemblyLine); // TFFTStorageField8 GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 7)) @@ -88,8 +93,8 @@ public class AssemblyLine implements Runnable { GT_ModHandler .getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4)) .fluidInputs(Materials.CrystallinePinkSlime.getMolten(4320), new FluidStack(radoxPoly, 2880)) - .noFluidOutputs().itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 8)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_UEV).addTo(AssemblyLine); + .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 8)).duration(30 * SECONDS).eut(TierEU.RECIPE_UEV) + .addTo(AssemblyLine); GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.tfftStorageField, 1, 8)) .metadata(RESEARCH_TIME, 2 * HOURS + 13 * MINUTES + 20 * SECONDS) @@ -106,7 +111,7 @@ public class AssemblyLine implements Runnable { GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 3), GT_ModHandler .getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4)) - .fluidInputs(Materials.MelodicAlloy.getMolten(5760), new FluidStack(radoxPoly, 3456)).noFluidOutputs() + .fluidInputs(Materials.MelodicAlloy.getMolten(5760), new FluidStack(radoxPoly, 3456)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 9)).duration(30 * SECONDS).eut(TierEU.RECIPE_UMV) .addTo(AssemblyLine); @@ -127,7 +132,7 @@ public class AssemblyLine implements Runnable { GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), GT_ModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 64, 6), GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1)) - .fluidInputs(Materials.StellarAlloy.getMolten(7200), new FluidStack(radoxPoly, 4608)).noFluidOutputs() + .fluidInputs(Materials.StellarAlloy.getMolten(7200), new FluidStack(radoxPoly, 4608)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 10)).duration(30 * SECONDS) .eut(TierEU.RECIPE_UXV).addTo(AssemblyLine); @@ -148,7 +153,7 @@ public class AssemblyLine implements Runnable { ItemList.Circuit_Parts_ResistorASMD.get(8), ItemList.Circuit_Parts_TransistorASMD.get(8), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64)) - .fluidInputs(new FluidStack(solderIndalloy, 720)).noFluidOutputs() + .fluidInputs(new FluidStack(solderIndalloy, 720)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)).duration(50 * SECONDS).eut(80_000) .addTo(AssemblyLine); @@ -172,8 +177,8 @@ public class AssemblyLine implements Runnable { .fluidInputs( new FluidStack(solderIndalloy, 2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) - .noFluidOutputs().itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)) - .duration(1 * MINUTES + 40 * SECONDS).eut(100_000).addTo(AssemblyLine); + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)).duration(1 * MINUTES + 40 * SECONDS) + .eut(100_000).addTo(AssemblyLine); // UV Capacitor GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)) @@ -195,7 +200,7 @@ public class AssemblyLine implements Runnable { .fluidInputs( new FluidStack(solderIndalloy, 2880), new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) - .noFluidOutputs().itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)).eut(200_000) + .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)).eut(200_000) .duration(1 * MINUTES + 40 * SECONDS).addTo(AssemblyLine); } } diff --git a/src/main/java/common/recipeLoaders/ChemicalReactor.java b/src/main/java/common/recipeLoaders/ChemicalReactor.java index 8e2e1862f5..d0b9dda565 100644 --- a/src/main/java/common/recipeLoaders/ChemicalReactor.java +++ b/src/main/java/common/recipeLoaders/ChemicalReactor.java @@ -20,8 +20,8 @@ public class ChemicalReactor implements Runnable { // Ceria Dust GT_Values.RA.stdBuilder().itemInputs(Materials.Cerium.getDust(2), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 2)) - .fluidInputs(Materials.Oxygen.getGas(3000)).noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .fluidInputs(Materials.Oxygen.getGas(3000)).duration(20 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); } } diff --git a/src/main/java/common/recipeLoaders/FormingPress.java b/src/main/java/common/recipeLoaders/FormingPress.java index 6979ec8b12..e667a448f6 100644 --- a/src/main/java/common/recipeLoaders/FormingPress.java +++ b/src/main/java/common/recipeLoaders/FormingPress.java @@ -22,6 +22,6 @@ public class FormingPress implements Runnable { craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10), ItemList.Shape_Mold_Plate.get(0)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicPlate.getMetaID(), 1)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sPressRecipes); + .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sPressRecipes); } } diff --git a/src/main/java/common/recipeLoaders/Mixer.java b/src/main/java/common/recipeLoaders/Mixer.java index 14861385ef..d736e70989 100644 --- a/src/main/java/common/recipeLoaders/Mixer.java +++ b/src/main/java/common/recipeLoaders/Mixer.java @@ -29,7 +29,7 @@ public class Mixer implements Runnable { Items.ZirconiaDust.getOreDictedItemStack(5), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicDust.getMetaID(), 6)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(96).addTo(sMixerRecipes); + .duration(20 * SECONDS).eut(96).addTo(sMixerRecipes); // GDC Ceramic Dust GT_Values.RA.stdBuilder().itemInputs( @@ -38,6 +38,6 @@ public class Mixer implements Runnable { craftingItem.getStackOfAmountFromDamage(Items.CeriaDust.getMetaID(), 9), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(craftingItem.getStackOfAmountFromDamage(Items.GDCCeramicDust.getMetaID(), 10)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMixerRecipes); + .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMixerRecipes); } } diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java index 8f50dec271..3b2bed91d0 100644 --- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java @@ -11,7 +11,11 @@ import net.minecraftforge.fluids.FluidStack; import com.github.technus.tectech.recipe.TT_recipeAdder; import common.Blocks; -import gregtech.api.enums.*; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; diff --git a/src/main/java/common/recipeLoaders/Unpackager.java b/src/main/java/common/recipeLoaders/Unpackager.java index 35a0fe9571..6e14e2bcb2 100644 --- a/src/main/java/common/recipeLoaders/Unpackager.java +++ b/src/main/java/common/recipeLoaders/Unpackager.java @@ -7,7 +7,12 @@ import net.minecraft.item.ItemStack; import common.Blocks; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -22,71 +27,61 @@ public class Unpackager implements Runnable { .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CrudeSteel, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrudeSteel, 6)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 2)) .itemOutputs( ItemList.Casing_Tank_1.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnergeticSilver, 6)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 3)) .itemOutputs( ItemList.Casing_Tank_3.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VividAlloy, 6)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 4)) .itemOutputs( ItemList.Casing_Tank_5.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Enderium, 6)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 5)) .itemOutputs( ItemList.Casing_Tank_7.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 6)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 6)) .itemOutputs( ItemList.Casing_Tank_7.get(4), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 7)) .itemOutputs( ItemList.Casing_Tank_10.get(16), GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 8)) .itemOutputs( ItemList.Quantum_Tank_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 12)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 9)) .itemOutputs( ItemList.Quantum_Tank_IV.get(4), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 12)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 10)) .itemOutputs( ItemList.Quantum_Tank_IV.get(16), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 12)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sUnboxinatorRecipes); + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sUnboxinatorRecipes); } @@ -97,64 +92,55 @@ public class Unpackager implements Runnable { .itemOutputs( GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 26), new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1)) .itemOutputs( ItemList.Energy_LapotronicOrb.get(1L), new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2)) .itemOutputs( ItemList.Energy_LapotronicOrb2.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3)) .itemOutputs( ItemList.Energy_Module.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4)) .itemOutputs( ItemList.Energy_Cluster.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 5)) .itemOutputs( ItemList.ZPM3.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8)) .itemOutputs( ItemList.ZPM4.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9)) .itemOutputs( ItemList.ZPM5.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10)) .itemOutputs( ItemList.ZPM6.get(1L), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sUnboxinatorRecipes); + .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); } } |