Skip to content

Commit e399fd7

Browse files
authored
Fix voltage display (#4462)
1 parent ba3bec0 commit e399fd7

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

src/main/java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public long getMaxVoltage() {
259259
// The voltage for recipe search is always on tier, so take the closest lower tier.
260260
// List check is done because single hatches will always be a "clean voltage," no need
261261
// for any additional checks.
262-
return GTValues.V[GTUtil.getFloorTierByVoltage(voltage)];
262+
return GTValues.VEX[GTUtil.getFloorTierByVoltage(voltage)];
263263
} else {
264264
return voltage;
265265
}

src/main/java/com/gregtechceu/gtceu/integration/jade/provider/RecipeLogicProvider.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
1212
import com.gregtechceu.gtceu.api.recipe.RecipeHelper;
1313
import com.gregtechceu.gtceu.client.util.TooltipHelper;
14-
import com.gregtechceu.gtceu.common.machine.multiblock.part.EnergyHatchPartMachine;
1514
import com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine;
1615
import com.gregtechceu.gtceu.utils.FormattingUtil;
1716
import com.gregtechceu.gtceu.utils.GTUtil;
@@ -69,12 +68,8 @@ public static long getVoltage(RecipeLogic capability) {
6968
} else if (capability.machine instanceof SimpleGeneratorMachine machine) {
7069
voltage = GTValues.V[machine.getTier()];
7170
} else if (capability.machine instanceof WorkableElectricMultiblockMachine machine) {
72-
voltage = machine.getParts().stream()
73-
.filter(EnergyHatchPartMachine.class::isInstance)
74-
.map(EnergyHatchPartMachine.class::cast)
75-
.mapToLong(dynamo -> GTValues.V[dynamo.getTier()])
76-
.max()
77-
.orElse(-1);
71+
voltage = Math.max(machine.getEnergyContainer().getHighestInputVoltage(),
72+
machine.getEnergyContainer().getOutputVoltage());
7873
}
7974
// default display as LV, this shouldn't happen because a machine is either electric or steam
8075
if (voltage == -1) voltage = 32;

0 commit comments

Comments
 (0)