Skip to content

Fix Bucket Mode Toggle on Pump Covers, and uncap Supply/KeepExact limits on Regulators #5415

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

Open
DilithiumThoride wants to merge 2 commits into
base: 1.20.1
Choose a base branch
from
+17 −3
Open

Fix Bucket Mode Toggle on Pump Covers, and uncap Supply/KeepExact limits on Regulators #5415

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
2637659
Bucket Mode Toggle changes associated display line format
DilithiumThoride Sep 11, 2026
c9ec1b7
Uncap Regulator SupplyExact/KeepExact limit (in accordance with Robot…
DilithiumThoride Sep 11, 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
2 changes: 1 addition & 1 deletion src/main/java/com/gregtechceu/gtceu/common/cover/FluidRegulatorCover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public void createCoverUIRows(Flow column, SidedPosGuiData data, PanelSyncManage
GTMuiCoverUtil.addTransferModeRow(column, transferMode);

column.child(
GTMuiWidgets.createIntInputWithBucketMode(transferSize, transferBucketMode, () -> maxFluidTransferRate)
GTMuiWidgets.createIntInputWithBucketMode(transferSize, transferBucketMode, () -> Integer.MAX_VALUE)
.setEnabledIf($ -> shouldShowTransferSize()));
}

Expand Down
18 changes: 16 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/common/mui/GTMuiWidgets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,8 @@ public static ParentWidget<?> createIntInputWithBucketMode(IntSyncValue intSyncV
EnumSyncValue<BucketMode> bucketModeSyncValue,
IntSupplier maxMB) {
StringSyncValue formattedValue = new StringSyncValue(
() -> String.valueOf(intSyncValue.getValue()),
(v) -> intSyncValue.setValue(Integer.parseInt(v), true,
() -> formattedBucketValue(intSyncValue.getIntValue(), bucketModeSyncValue.getValue()),
(v) -> intSyncValue.setValue(bucketsFromFormattedValue(v, bucketModeSyncValue.getValue()), true,
true))
.allowC2S();

Expand Down Expand Up @@ -630,6 +630,20 @@ public boolean onMouseScrolled(double delta) {
.stateOverlay(1, BucketMode.MILLI_BUCKET.icon.asIcon().size(16)));
}

public static String formattedBucketValue(int millibuckets, BucketMode bucketMode) {
if (bucketMode == BucketMode.MILLI_BUCKET) return String.valueOf(millibuckets);
StringBuilder buckets = new StringBuilder(String.format("%04d", millibuckets));
buckets.insert(buckets.length() - 3, '.');
return buckets.toString();
}

public static int bucketsFromFormattedValue(String uiInput, BucketMode bucketMode) {
if (bucketMode == BucketMode.MILLI_BUCKET) return Integer.parseInt(uiInput);
if (!uiInput.contains(".")) return Integer.parseInt(uiInput) * 1000;
String[] splitInput = uiInput.split("\\.");
return (Integer.parseInt(splitInput[0]) * 1000) + Integer.parseInt(splitInput[1]);
}

public static SlotGroupWidget verticalPlayerInventory(SlotGroupWidget.SlotConsumer slotConsumer) {
SlotGroupWidget slotGroupWidget = new SlotGroupWidget();
slotGroupWidget.coverChildren();
Expand Down
Loading