Skip to content

Commit 2e430c8

Browse files
Fix Jade provider displaying no energy for addon steam machines consuming 1mB/t (#4127)
1 parent 48b3292 commit 2e430c8

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,18 @@ protected void addTooltip(CompoundTag capData, ITooltip tooltip, Player player,
8888
var isInput = recipeInfo.getBoolean("isInput");
8989
boolean isSteam = false;
9090

91-
if (blockEntity instanceof MetaMachineBlockEntity mbe) {
92-
var machine = mbe.getMetaMachine();
93-
if (machine instanceof SimpleSteamMachine ssm) {
94-
EUt = (long) (EUt * ssm.getConversionRate());
95-
isSteam = true;
96-
} else if (machine instanceof SteamParallelMultiblockMachine smb) {
97-
EUt = (long) (EUt * smb.getConversionRate());
98-
isSteam = true;
91+
if (EUt > 0) {
92+
if (blockEntity instanceof MetaMachineBlockEntity mbe) {
93+
var machine = mbe.getMetaMachine();
94+
if (machine instanceof SimpleSteamMachine ssm) {
95+
EUt = (long) Math.ceil(EUt * ssm.getConversionRate());
96+
isSteam = true;
97+
} else if (machine instanceof SteamParallelMultiblockMachine smb) {
98+
EUt = (long) Math.ceil(EUt * smb.getConversionRate());
99+
isSteam = true;
100+
}
99101
}
100-
}
101102

102-
if (EUt > 0) {
103103
MutableComponent text;
104104

105105
if (isSteam) {

src/main/java/com/gregtechceu/gtceu/integration/top/provider/RecipeLogicInfoProvider.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import com.gregtechceu.gtceu.api.GTValues;
55
import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper;
66
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
7+
import com.gregtechceu.gtceu.api.machine.steam.SimpleSteamMachine;
78
import com.gregtechceu.gtceu.api.machine.steam.SteamMachine;
89
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
910
import com.gregtechceu.gtceu.api.recipe.RecipeHelper;
11+
import com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine;
1012
import com.gregtechceu.gtceu.integration.jade.provider.RecipeLogicProvider;
1113
import com.gregtechceu.gtceu.utils.FormattingUtil;
1214
import com.gregtechceu.gtceu.utils.GTUtil;
@@ -50,13 +52,19 @@ protected void addProbeInfo(RecipeLogic capability, IProbeInfo probeInfo, Player
5052
// do not show energy usage on machines that do not use energy
5153
return;
5254
}
53-
String formatted = FormattingUtil.formatNumbers(EUt.getTotalEU()) + TextStyleClass.INFO;
5455
Component text = null;
5556

5657
if (blockEntity instanceof IMachineBlockEntity machineBlockEntity) {
5758
var machine = machineBlockEntity.getMetaMachine();
59+
long MBt = 0;
60+
if (machine instanceof SimpleSteamMachine ssm) {
61+
MBt = (long) Math.ceil(EUt.getTotalEU() * ssm.getConversionRate());
62+
} else if (machine instanceof SteamParallelMultiblockMachine smb) {
63+
MBt = (long) Math.ceil(EUt.getTotalEU() * smb.getConversionRate());
64+
}
5865
if (machine instanceof SteamMachine) {
59-
text = Component.translatable("gtceu.jade.fluid_use", formatted)
66+
text = Component.translatable("gtceu.jade.fluid_use",
67+
FormattingUtil.formatNumbers(MBt) + TextStyleClass.INFO)
6068
.withStyle(ChatFormatting.GREEN);
6169
}
6270
}
@@ -71,7 +79,7 @@ protected void addProbeInfo(RecipeLogic capability, IProbeInfo probeInfo, Player
7179
.append(GTValues.VNF[tier])
7280
.append(Component.translatable("gtceu.universal.padded_parentheses",
7381
(Component.translatable("gtceu.recipe.eu.total",
74-
formatted)))
82+
FormattingUtil.formatNumbers(EUt.getTotalEU()) + TextStyleClass.INFO)))
7583
.withStyle(ChatFormatting.WHITE));
7684
}
7785

0 commit comments

Comments
 (0)