Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

Commit

Permalink
Cleanup noXXXYYY methods (#361)
Browse files Browse the repository at this point in the history
  • Loading branch information
@miozune
miozune authored Sep 22, 2023
1 parent 21c182e commit 05f7e34
Show file tree
Hide file tree
Showing 37 changed files with 390 additions and 443 deletions.
2 changes: 1 addition & 1 deletion src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public static void regenerateBioFluids() {
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);
}
Expand Down
20 changes: 9 additions & 11 deletions src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ public static void runArtificialMicaRecipe() {
// 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))
Expand All @@ -43,7 +42,7 @@ public static void runArtificialMicaRecipe() {

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))
Expand All @@ -56,13 +55,12 @@ public static void runArtificialMicaRecipe() {

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()
Expand All @@ -75,7 +73,7 @@ public static void runArtificialMicaRecipe() {
.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()
Expand All @@ -102,7 +100,7 @@ public static void runArtificialMicaRecipe() {
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()
Expand All @@ -115,11 +113,11 @@ public static void runArtificialMicaRecipe() {
.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);

Expand Down Expand Up @@ -150,7 +148,7 @@ public static void runArtificialMicaRecipe() {
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);

}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static void run() {
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);

Expand Down
50 changes: 24 additions & 26 deletions src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,59 +46,59 @@ public void run() {
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()
.itemInputs(
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(
Expand All @@ -107,8 +107,8 @@ public void run() {
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(
Expand All @@ -120,7 +120,7 @@ public void run() {
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];
Expand Down Expand Up @@ -171,7 +171,7 @@ public void run() {
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()
Expand All @@ -185,8 +185,7 @@ public void run() {
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(
Expand All @@ -199,8 +198,7 @@ public void run() {
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);
}
}

Expand All @@ -209,28 +207,28 @@ public void run() {
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(
new ItemStack(GregTech_API.sBlockCasings3, 1, 12),
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);
}
}
10 changes: 5 additions & 5 deletions src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public void run() {
.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))
Expand All @@ -54,8 +54,8 @@ public void run() {
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))
Expand All @@ -68,7 +68,7 @@ public void run() {
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);
}
}
8 changes: 4 additions & 4 deletions src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ public void run() {

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);

}
}
Expand Down
Loading

0 comments on commit 05f7e34

Please sign in to comment.