Skip to content

Commit b34974a

Browse files
StaffiXserenibyss
StaffiX
and
serenibyss
authored
Remove recipe optimization (#1200)
Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>
1 parent 07a0321 commit b34974a

11 files changed

+766
-783
lines changed

‎src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java

+20-37
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private void runAdditionalFuelRecipes() {
198198

199199
// super heavy -> heavy radox conversion
200200
GTValues.RA.stdBuilder().itemOutputs().fluidInputs(RadoxSuperHeavy.getFluid(1000))
201-
.fluidOutputs(RadoxHeavy.getFluid(2000)).duration(50 * MINUTES).eut(TierEU.RECIPE_UV).noOptimize()
201+
.fluidOutputs(RadoxHeavy.getFluid(2000)).duration(50 * MINUTES).eut(TierEU.RECIPE_UV)
202202
.addTo(centrifugeRecipes);
203203

204204
// heavy radox + Nq+ -> Nq*
@@ -270,8 +270,7 @@ private void bacterialVatRecipes() {
270270
GTValues.RA.stdBuilder().itemInputs(AntimonyTrioxide.getDust(16), Osmium.getDust(16))
271271
.special(BioItemList.getPetriDish(CultureSet.get("CombinedBac"))).fluidInputs(Oil.getFluid(20))
272272
.fluidOutputs(Xenoxene.getFluid(20)).duration(3 * MINUTES).eut(TierEU.RECIPE_UEV).metadata(GLASS, 8)
273-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), false)).noOptimize()
274-
.addTo(bacterialVatRecipes);
273+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), false)).addTo(bacterialVatRecipes);
275274

276275
GTValues.RA.stdBuilder()
277276
.itemInputs(
@@ -282,8 +281,7 @@ private void bacterialVatRecipes() {
282281
.special(BioItemList.getPetriDish(CultureSet.get("StemCellBac")))
283282
.fluidInputs(GrowthMediumRaw.getFluid(8)).fluidOutputs(BioMediumRaw.getFluid(2)).duration(3 * MINUTES)
284283
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 6)
285-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
286-
.addTo(bacterialVatRecipes);
284+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);
287285

288286
GTValues.RA.stdBuilder()
289287
.itemInputs(
@@ -294,8 +292,7 @@ private void bacterialVatRecipes() {
294292
.special(BioItemList.getPetriDish(CultureSet.get("BioCellBac")))
295293
.fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(5)).duration(3 * MINUTES)
296294
.eut(TierEU.RECIPE_ZPM).metadata(GLASS, 7)
297-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)).noOptimize()
298-
.addTo(bacterialVatRecipes);
295+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true)).addTo(bacterialVatRecipes);
299296

300297
GTValues.RA.stdBuilder()
301298
.itemInputs(
@@ -305,124 +302,110 @@ private void bacterialVatRecipes() {
305302
.special(BioItemList.getPetriDish(CultureSet.get("BioCellBac")))
306303
.fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(10)).duration(3 * MINUTES)
307304
.eut(TierEU.RECIPE_UV).metadata(GLASS, 8)
308-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).noOptimize().requiresCleanRoom()
305+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Naquadria), true)).requiresCleanRoom()
309306
.addTo(bacterialVatRecipes);
310307

311308
GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Genetics.ID, "misc", 2L, 4))
312309
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
313310
.fluidInputs(GTModHandler.getDistilledWater(4L))
314311
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 2)).duration(7 * SECONDS + 10 * TICKS)
315-
.eut(TierEU.RECIPE_HV).metadata(GLASS, 4).noOptimize().addTo(bacterialVatRecipes);
312+
.eut(TierEU.RECIPE_HV).metadata(GLASS, 4).addTo(bacterialVatRecipes);
316313

317314
GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
318315
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
319316
.fluidInputs(GTModHandler.getDistilledWater(8L))
320317
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 4)).duration(7 * SECONDS + 10 * TICKS)
321318
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
322-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
323-
.addTo(bacterialVatRecipes);
319+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes);
324320

325321
GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
326322
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
327323
.fluidInputs(GTModHandler.getDistilledWater(16L))
328324
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8)).duration(7 * SECONDS + 10 * TICKS)
329325
.eut(TierEU.RECIPE_IV).metadata(GLASS, 5)
330-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
331-
.addTo(bacterialVatRecipes);
326+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);
332327

333328
GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
334329
.special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium")))
335330
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
336331
.fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8 * 9))
337332
.duration(9 * (7 * SECONDS + 10 * TICKS)).eut(TierEU.RECIPE_IV).metadata(GLASS, 5)
338-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
339-
.addTo(bacterialVatRecipes);
333+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);
340334

341335
GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0))
342336
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
343337
.fluidInputs(GTModHandler.getDistilledWater(4L))
344338
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 2)).duration(15 * SECONDS)
345339
.eut(TierEU.RECIPE_HV).metadata(GLASS, 4)
346-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
347-
.addTo(bacterialVatRecipes);
340+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes);
348341

349342
GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
350343
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
351344
.fluidInputs(GTModHandler.getDistilledWater(8L))
352345
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)).duration(15 * SECONDS)
353346
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
354-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
355-
.addTo(bacterialVatRecipes);
347+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);
356348

357349
GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
358350
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
359351
.fluidInputs(GTModHandler.getDistilledWater(16L))
360352
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8)).duration(15 * SECONDS)
361353
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
362-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize()
363-
.addTo(bacterialVatRecipes);
354+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).addTo(bacterialVatRecipes);
364355

365356
GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
366357
.special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria")))
367358
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
368359
.fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8 * 9)).duration(9 * 15 * SECONDS)
369360
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
370-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize()
371-
.addTo(bacterialVatRecipes);
361+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).addTo(bacterialVatRecipes);
372362

373363
GTValues.RA.stdBuilder().itemInputs(CustomItemList.MarsStoneDust.get(16L))
374364
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
375365
.fluidInputs(GTModHandler.getDistilledWater(4L))
376366
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 1)).duration(30 * SECONDS)
377367
.eut(TierEU.RECIPE_EV).metadata(GLASS, 5)
378-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).noOptimize()
379-
.addTo(bacterialVatRecipes);
368+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Bismuth), false)).addTo(bacterialVatRecipes);
380369

381370
GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1))
382371
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
383372
.fluidInputs(GTModHandler.getDistilledWater(8L))
384373
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 2)).duration(30 * SECONDS)
385374
.eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
386-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
387-
.addTo(bacterialVatRecipes);
375+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);
388376

389377
GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
390378
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
391379
.fluidInputs(GTModHandler.getDistilledWater(16L))
392380
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4)).duration(30 * SECONDS)
393381
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
394-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
395-
.addTo(bacterialVatRecipes);
382+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);
396383

397384
GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
398385
.special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac")))
399386
.fluidInputs(GTModHandler.getDistilledWater(16L * 9L))
400387
.fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4 * 9)).duration(9 * 30 * SECONDS)
401388
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
402-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
403-
.addTo(bacterialVatRecipes);
389+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);
404390

405391
GTValues.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(4))
406392
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
407393
.fluidInputs(GTModHandler.getDistilledWater(4L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1))
408394
.duration(1 * MINUTES).eut(TierEU.RECIPE_IV).metadata(GLASS, 6)
409-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
410-
.addTo(bacterialVatRecipes);
395+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).addTo(bacterialVatRecipes);
411396

412397
GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1))
413398
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
414399
.fluidInputs(GTModHandler.getDistilledWater(8L)).fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2))
415400
.duration(1 * MINUTES).eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
416-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
417-
.addTo(bacterialVatRecipes);
401+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);
418402

419403
GTValues.RA.stdBuilder().itemInputs(InfinityCatalyst.getDust(1))
420404
.special(BioItemList.getPetriDish(CultureSet.get("Mutagen")))
421405
.fluidInputs(GTModHandler.getDistilledWater(8L * 9L))
422406
.fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2 * 9)).duration(9 * MINUTES)
423407
.eut(TierEU.RECIPE_LuV).metadata(GLASS, 7)
424-
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).noOptimize()
425-
.addTo(bacterialVatRecipes);
408+
.metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), true)).addTo(bacterialVatRecipes);
426409
}
427410

428411
private void bioLabRecipes() {

‎src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ public static void registerRecipes() {
132132
.special(BioItemList.getPetriDish(CultureSet.get("TcetiEBac")))
133133
.fluidInputs(new FluidStack(BIOFLUIDS[2], 50)).fluidOutputs(new FluidStack(BIOFLUIDS[3], 50))
134134
.duration(1 * MINUTES).eut(TierEU.RECIPE_UV).metadata(GLASS, 8)
135-
.metadata(SIEVERT, new Sievert(100, false)).noOptimize().addTo(bacterialVatRecipes);
135+
.metadata(SIEVERT, new Sievert(100, false)).addTo(bacterialVatRecipes);
136136

137137
for (int i = 0; i < OreDictionary.getOres("cropTcetiESeaweed").size(); i++) {
138138
GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(i + 1))
139139
.itemOutputs(OreDictionary.getOres("cropTcetiESeaweed").get(i).copy().splitStack(64))
140140
.fluidInputs(new FluidStack(BIOFLUIDS[3], 1000)).duration(2 * SECONDS).eut(TierEU.RECIPE_UV)
141-
.noOptimize().addTo(centrifugeRecipes);
141+
.addTo(centrifugeRecipes);
142142
}
143143

144144
GTValues.RA.stdBuilder()
@@ -150,7 +150,7 @@ public static void registerRecipes() {
150150
.special(BioItemList.getPetriDish(CultureSet.get("OvumBac")))
151151
.fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 4))
152152
.fluidOutputs(Materials.GrowthMediumRaw.getFluid(1)).duration(1 * MINUTES).eut(TierEU.RECIPE_IV)
153-
.metadata(GLASS, 5).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false)).noOptimize()
153+
.metadata(GLASS, 5).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Uranium), false))
154154
.addTo(bacterialVatRecipes);
155155

156156
GTValues.RA.stdBuilder()
@@ -162,7 +162,7 @@ public static void registerRecipes() {
162162
.special(BioItemList.getPetriDish(CultureSet.get("OvumBac")))
163163
.fluidInputs(FluidRegistry.getFluidStack("bacterialsludge", 4))
164164
.fluidOutputs(Materials.GrowthMediumRaw.getFluid(2)).duration(1 * MINUTES).eut(TierEU.RECIPE_LuV)
165-
.metadata(GLASS, 6).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false)).noOptimize()
165+
.metadata(GLASS, 6).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(Plutonium), false))
166166
.addTo(bacterialVatRecipes);
167167

168168
GTValues.RA.stdBuilder()
@@ -175,6 +175,6 @@ public static void registerRecipes() {
175175
.fluidInputs(FluidRegistry.getFluidStack("mutagen", 4))
176176
.fluidOutputs(Materials.GrowthMediumRaw.getFluid(4)).duration(1 * MINUTES).eut(TierEU.RECIPE_ZPM)
177177
.metadata(GLASS, 7).metadata(SIEVERT, new Sievert(BWUtil.calculateSv(NaquadahEnriched), true))
178-
.noOptimize().addTo(bacterialVatRecipes);
178+
.addTo(bacterialVatRecipes);
179179
}
180180
}

‎src/main/java/com/dreammaster/gthandler/recipes/BlastFurnaceRecipes.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -878,10 +878,11 @@ public void run() {
878878

879879
GTValues.RA.stdBuilder()
880880
.itemInputs(
881-
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 30L),
882-
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryolite, 15L))
883-
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 12L)).duration(4 * MINUTES)
884-
.eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 963).addTo(blastFurnaceRecipes);
881+
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10L),
882+
GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cryolite, 5L))
883+
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 4L))
884+
.duration(1 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).metadata(COIL_HEAT, 963)
885+
.addTo(blastFurnaceRecipes);
885886

886887
GTValues.RA.stdBuilder()
887888
.itemInputs(

0 commit comments

Comments
 (0)