Skip to content

Commit ff78db4

Browse files
committed
null instead of empty string
1 parent 4398469 commit ff78db4

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/main/java/gregtech/api/mui/sync/GTFluidSyncHandler.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.cleanroommc.modularui.value.DynamicValue;
2121
import com.cleanroommc.modularui.value.sync.SyncHandler;
2222
import org.jetbrains.annotations.NotNull;
23+
import org.jetbrains.annotations.Nullable;
2324

2425
import java.util.function.BooleanSupplier;
2526
import java.util.function.Consumer;
@@ -154,13 +155,14 @@ public boolean showAmount() {
154155
return String.format("%,d", tankFluid == null ? 0 : tankFluid.amount);
155156
}
156157

157-
public @NotNull String getFluidLocalizedName() {
158+
public @Nullable String getFluidLocalizedName() {
158159
var tankFluid = this.tank.getFluid();
160+
var lockedFluid = this.lockedFluid.getValue();
159161

160-
if (tankFluid == null && getLockedFluid() != null)
161-
return getLockedFluid().getLocalizedName();
162+
if (tankFluid == null && lockedFluid != null)
163+
return lockedFluid.getLocalizedName();
162164

163-
return tankFluid == null ? "" : tankFluid.getLocalizedName();
165+
return tankFluid == null ? null : tankFluid.getLocalizedName();
164166
}
165167

166168
@Override

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
272272
.textBuilder(richText -> {
273273
richText.addLine(IKey.lang("gregtech.gui.fluid_amount"));
274274
String name = fluidSyncHandler.getFluidLocalizedName();
275-
if (name.isEmpty()) return;
275+
if (name == null) return;
276276
if (name.length() > 25) name = name.substring(0, 25) + "...";
277277

278278
richText.addLine(IKey.str(name));

0 commit comments

Comments
 (0)