Skip to content

Fix tooltips and allow tank locking - #5116

Merged
jurrejelle merged 1 commit into
1.20.1from
jj/output-slot-fluid-locking
Jul 15, 2026
Merged

Fix tooltips and allow tank locking#5116
jurrejelle merged 1 commit into
1.20.1from
jj/output-slot-fluid-locking

Conversation

@jurrejelle

Copy link
Copy Markdown
Contributor

What

We lost locking functionality during the MUI refactor (

() -> this.tank.getLockedFluid().getFluid(), f -> {
if (!this.tank.getFluidInTank(0).isEmpty()) {
return;
}
if (f == null || f.isEmpty()) {
this.tank.setLocked(false);
} else {
FluidStack newFluid = f.copy();
newFluid.setAmount(1);
this.tank.setLocked(true, newFluid);
}
}).setShowAmount(false).setDrawHoverTips(true).setBackground(GuiTextures.FLUID_SLOT));
wasn't copied). We re-implement it from scratch on NotifiableFluidTank in a way that doesn't allow tank.lockedFluid to drift from tank.filter

Implementation Details

LDlib implemented this in the UI code, we implement it in the underlying notifiable handler code

AI Usage

  • No AI driven tools were used for this pull request.
  • Yes AI driven tools were used for this pull request.

Agent Used

Opus 4.8

Agent Usage Description

Helped debugging but didn't write any code

Outcome

Fluid hatch locking work again

How Was This Tested

In game, in call with html

@jurrejelle
jurrejelle requested a review from a team as a code owner July 15, 2026 14:36
@jurrejelle jurrejelle added type: bugfix General bug fixes 1.20.1 Release: Patch - 0.0.X Smaller changes that either are bug fixes or very minor tweaks. labels Jul 15, 2026

@TarLaboratories TarLaboratories left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@github-actions github-actions Bot added the Tests: Passed Game Tests have passed on this PR label Jul 15, 2026
@jurrejelle
jurrejelle merged commit dc538ec into 1.20.1 Jul 15, 2026
5 of 7 checks passed
@jurrejelle
jurrejelle deleted the jj/output-slot-fluid-locking branch July 15, 2026 14:40

@htmlcsjs htmlcsjs left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rubber ducked stamped 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.20.1 Release: Patch - 0.0.X Smaller changes that either are bug fixes or very minor tweaks. Tests: Passed Game Tests have passed on this PR type: bugfix General bug fixes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants