Skip to content

Added fluid filter to FluidSlotSyncHandler #134

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
TheYoingLad merged 1 commit into from
May 31, 2026
Merged

Added fluid filter to FluidSlotSyncHandler #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion src/main/java/com/cleanroommc/modularui/value/sync/FluidSlotSyncHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.function.Predicate;

public class FluidSlotSyncHandler extends ValueSyncHandler<FluidStack, FluidSlotSyncHandler> {

public static boolean isFluidEmpty(@Nullable FluidStack fluidStack) {
Expand All @@ -37,6 +39,7 @@ public static FluidStack copyFluid(@Nullable FluidStack fluidStack) {
private boolean canFillSlot = true, canDrainSlot = true, controlsAmount = true, phantom = false;
@Nullable
private FluidStack lastStoredPhantomFluid;
private Predicate<FluidStack> filter = fluidStack -> true;

public FluidSlotSyncHandler(IFluidTank fluidTank) {
this.fluidTank = fluidTank;
Expand Down Expand Up @@ -198,6 +201,7 @@ protected void tryClickPhantom(MouseData mouseData, ItemStack cursorStack) {
ItemStack heldItemSizedOne = cursorStack.copy();
heldItemSizedOne.stackSize = 1;
FluidStack heldFluid = FluidInteractions.getFluidForItem(heldItemSizedOne);
if (!filter.test(heldFluid)) return;
if ((controlsAmount || currentFluid == null) && heldFluid != null) {
fillPhantom(heldFluid);
} else {
Expand Down Expand Up @@ -345,7 +349,7 @@ private int batchDrainFluidToContainers(ItemStack heldItem, @Nullable FluidStack

protected void fillFluid(@NotNull FluidStack heldFluid, boolean processFullStack) {
FluidStack currentFluid = fluidTank.getFluid();
if (currentFluid != null && !currentFluid.isFluidEqual(heldFluid)) {
if (currentFluid != null && !currentFluid.isFluidEqual(heldFluid) || !filter.test(heldFluid)) {
return;
}

Expand Down Expand Up @@ -528,6 +532,10 @@ public boolean isPhantom() {
return this.phantom;
}

public Predicate<FluidStack> getFilter() {
return filter;
}

public FluidSlotSyncHandler phantom(boolean phantom) {
this.phantom = phantom;
return this;
Expand All @@ -550,4 +558,9 @@ public FluidSlotSyncHandler canFillSlot(boolean canFillSlot) {
this.canFillSlot = canFillSlot;
return this;
}

public FluidSlotSyncHandler filter(Predicate<FluidStack> filter) {
this.filter = filter;
return this;
}
}