Skip to content

add support for partial draining of things like gt cells #87

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
chrombread wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for partial draining of things like gt cells #87

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
13 changes: 13 additions & 0 deletions 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 @@ -9,11 +9,14 @@
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
import net.minecraftforge.fluids.IFluidTank;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import static com.google.common.primitives.Ints.saturatedCast;

public class FluidSlotSyncHandler extends ValueSyncHandler<FluidStack> {

public static boolean isFluidEmpty(@Nullable FluidStack fluidStack) {
Expand Down Expand Up @@ -294,6 +297,16 @@ protected void fillFluid(@NotNull FluidStack heldFluid, boolean processFullStack
fluidAmountTaken = heldFluid.amount;
}

if (itemStackEmptied == null && heldItemSizedOne.getItem() instanceof IFluidContainerItem container) {
// either partially accepted, or is IFluidContainerItem
FluidStack tDrained = container.drain(heldItemSizedOne, saturatedCast(freeSpace), true);
if (tDrained != null && tDrained.amount > 0) {
// something is actually drained - change the cell and drop it to player
itemStackEmptied = heldItemSizedOne;
fluidAmountTaken = tDrained.amount;
}
}

if (itemStackEmptied == null) {
return;
}
Expand Down