Skip to content

Take the fluid unit from GTNHLib instead of hardcoding L #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boubou19 merged 2 commits into from
Aug 2, 2026
Merged

Take the fluid unit from GTNHLib instead of hardcoding L #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a4f550
Take the fluid unit from GTNHLib instead of hardcoding L
Eldrinn-Elantey Aug 2, 2026
eaace94
Use milli prefix with buckets and fix the tooltip unit
Eldrinn-Elantey Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/main/java/com/cleanroommc/modularui/widgets/AbstractFluidDisplayWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;

import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatConfig;
import gregtech.api.util.GTUtility;
import org.jetbrains.annotations.Nullable;

Expand All @@ -25,8 +26,8 @@ public abstract class AbstractFluidDisplayWidget<W extends AbstractFluidDisplayW
public static final String UNIT_LITER = "L";

private final Box contentPadding = new Box().all(1);
private String unit = UNIT_LITER;
private SIPrefix baseUnitPrefix = SIPrefix.One;
private @Nullable String unit = null;
private @Nullable SIPrefix baseUnitPrefix = null;
private boolean flipLighterThanAir = true;

protected AbstractFluidDisplayWidget() {
Expand Down Expand Up @@ -98,12 +99,21 @@ public final String getUnit() {
return getBaseUnitSiPrefix().stringSymbol + getBaseUnit();
}

/**
* @return the explicitly set base unit, or the one matching the fluid unit configured in GTNHLib
*/
public String getBaseUnit() {
return this.unit;
if (this.unit != null) return this.unit;
return usesMilliBuckets() ? UNIT_BUCKET : UNIT_LITER;
}

public SIPrefix getBaseUnitSiPrefix() {
return this.baseUnitPrefix;
if (this.baseUnitPrefix != null) return this.baseUnitPrefix;
return usesMilliBuckets() ? SIPrefix.Milli : SIPrefix.One;
}

private boolean usesMilliBuckets() {
return NumberFormatConfig.useForgeFluidMillibuckets;
}

public boolean isFlipLighterThanAir() {
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/cleanroommc/modularui/widgets/slot/FluidSlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected void addToolTip(RichTooltip tooltip) {
if (this.syncHandler.isPhantom()) {
if (fluid != null) {
if (this.syncHandler.controlsAmount()) {
tooltip.addLine(IKey.lang("modularui2.fluid.phantom.amount", formatFluidTooltipAmount(fluid.amount), getBaseUnit()));
tooltip.addLine(IKey.lang("modularui2.fluid.phantom.amount", formatFluidTooltipAmount(fluid.amount), getUnit()));
Comment thread
brachy84 marked this conversation as resolved.
}
addAdditionalFluidInfo(tooltip, fluid);
} else {
Expand All @@ -73,7 +73,7 @@ protected void addToolTip(RichTooltip tooltip) {
}
} else {
if (fluid != null) {
tooltip.addLine(IKey.lang("modularui2.fluid.amount", formatFluidTooltipAmount(fluid.amount), formatFluidTooltipAmount(fluidTank.getCapacity()), getBaseUnit()));
tooltip.addLine(IKey.lang("modularui2.fluid.amount", formatFluidTooltipAmount(fluid.amount), formatFluidTooltipAmount(fluidTank.getCapacity()), getUnit()));
Comment thread
brachy84 marked this conversation as resolved.
addAdditionalFluidInfo(tooltip, fluid);
} else {
tooltip.addLine(IKey.lang("modularui2.fluid.empty"));
Expand Down Expand Up @@ -102,7 +102,6 @@ public void addAdditionalFluidInfo(RichTooltip tooltip, FluidStack fluidStack) {

public String formatFluidTooltipAmount(double amount) {
// the tooltip show the full number
// 1.7.10 hardcoded to use UNIT_LITER for now, so no milli-buckets.
return TOOLTIP_FORMAT.format(amount);
}

Expand Down