Skip to content

[Refacor/Bugfix] Clear only fluid nbt for GTFluidHandlerItemStack #2894

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
ALongStringOfNumbers merged 1 commit into from
Dec 1, 2025
Merged

[Refacor/Bugfix] Clear only fluid nbt for GTFluidHandlerItemStack #2894

Show file tree
Hide file tree
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
21 changes: 5 additions & 16 deletions src/main/java/gregtech/api/capability/impl/GTFluidHandlerItemStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,11 @@ public IFluidTankProperties[] getTankProperties() {
}

@Override
public FluidStack drain(FluidStack resource, boolean doDrain) {
FluidStack drained = super.drain(resource, doDrain);
this.removeTagWhenEmpty(doDrain);
return drained;
}

@Override
public FluidStack drain(int maxDrain, boolean doDrain) {
FluidStack drained = super.drain(maxDrain, doDrain);
this.removeTagWhenEmpty(doDrain);
return drained;
}

private void removeTagWhenEmpty(boolean doDrain) {
if (doDrain && this.getFluid() == null) {
this.container.setTagCompound(null);
protected void setContainerToEmpty() {
super.setContainerToEmpty();
var tag = container.getTagCompound();
if (tag != null && tag.isEmpty()) {
container.setTagCompound(null);
}
}

Expand Down
29 changes: 9 additions & 20 deletions src/main/java/gregtech/api/capability/impl/GTSimpleFluidHandlerItemStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,26 +68,6 @@ public IFluidTankProperties[] getTankProperties() {
return properties;
}

@Override
public FluidStack drain(FluidStack resource, boolean doDrain) {
FluidStack drained = super.drain(resource, doDrain);
this.removeTagWhenEmpty(doDrain);
return drained;
}

@Override
public FluidStack drain(int maxDrain, boolean doDrain) {
FluidStack drained = super.drain(maxDrain, doDrain);
this.removeTagWhenEmpty(doDrain);
return drained;
}

private void removeTagWhenEmpty(boolean doDrain) {
if (doDrain && this.getFluid() == null) {
this.container.setTagCompound(null);
}
}

@Override
public boolean canFillFluidType(FluidStack fluid) {
return canFill() && (this.filter == null || this.filter.test(fluid));
Expand All @@ -98,6 +78,15 @@ public boolean canDrainFluidType(FluidStack fluid) {
return canDrain();
}

@Override
protected void setContainerToEmpty() {
super.setContainerToEmpty();
var tag = container.getTagCompound();
if (tag != null && tag.isEmpty()) {
container.setTagCompound(null);
}
}

private final class TankProperties implements IFluidTankProperties {

@Nullable
Expand Down
Loading