Skip to content

Commit fc3a306

Browse files
committed
Merge remote-tracking branch 'origin/gp/multi-madness-2025-Jul' into gp/multi-madness-2025-Jul
2 parents 7107d77 + a2dc0d8 commit fc3a306

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/main/java/com/ghostipedia/cosmiccore/common/data/recipe/CosmicRecipeModifiers.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.ghostipedia.cosmiccore.common.machine.multiblock.electric.MagneticFieldMachine;
44

5-
import com.gregtechceu.gtceu.api.capability.IParallelHatch;
65
import com.gregtechceu.gtceu.api.capability.recipe.IO;
76
import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability;
87
import com.gregtechceu.gtceu.api.machine.MetaMachine;
@@ -23,7 +22,6 @@
2322
import org.jetbrains.annotations.NotNull;
2423

2524
import java.util.Collections;
26-
import java.util.Optional;
2725

2826
public class CosmicRecipeModifiers {
2927

@@ -59,17 +57,10 @@ public static ModifierFunction vomahineReactorOC(MetaMachine machine, GTRecipe r
5957

6058
public static ModifierFunction chemicalVatLogic(MetaMachine machine, GTRecipe recipe) {
6159
if (machine instanceof WorkableMultiblockMachine vatMachine) {
62-
Optional<IParallelHatch> optionalIParallelHatch = vatMachine.getParts().stream()
63-
.filter(IParallelHatch.class::isInstance).map(IParallelHatch.class::cast).findAny();
64-
if (optionalIParallelHatch.isPresent()) {
65-
IParallelHatch parallelHatch = optionalIParallelHatch.get();
66-
var actualParallel = 1;
67-
if (parallelHatch.getCurrentParallel() != 0) {
68-
long EUt = recipe.getInputEUt().getTotalEU();
69-
actualParallel = ParallelLogic.getParallelAmount(vatMachine, recipe,
70-
parallelHatch.getCurrentParallel());
60+
if (vatMachine.getParallelHatch().isPresent()) {
61+
int actualParallel = ParallelLogic.getParallelAmount(vatMachine, recipe,
62+
vatMachine.getParallelHatch().get().getCurrentParallel());
7163

72-
}
7364
return ModifierFunction.builder()
7465
.modifyAllContents(ContentModifier.multiplier(actualParallel))
7566
.eutMultiplier(actualParallel * 0.75F)

0 commit comments

Comments
 (0)