Skip to content

Commit c5edec4

Browse files
committed
refactor: yeet the removeTagWhenEmpty in FluidHandlerISs
1 parent 70bfc8a commit c5edec4

File tree

2 files changed

+0
-40
lines changed

2 files changed

+0
-40
lines changed

src/main/java/gregtech/api/capability/impl/GTFluidHandlerItemStack.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,6 @@ public IFluidTankProperties[] getTankProperties() {
6868
return properties;
6969
}
7070

71-
@Override
72-
public FluidStack drain(FluidStack resource, boolean doDrain) {
73-
FluidStack drained = super.drain(resource, doDrain);
74-
this.removeTagWhenEmpty(doDrain);
75-
return drained;
76-
}
77-
78-
@Override
79-
public FluidStack drain(int maxDrain, boolean doDrain) {
80-
FluidStack drained = super.drain(maxDrain, doDrain);
81-
this.removeTagWhenEmpty(doDrain);
82-
return drained;
83-
}
84-
85-
private void removeTagWhenEmpty(boolean doDrain) {
86-
if (doDrain && this.getFluid() == null) {
87-
this.container.setTagCompound(null);
88-
}
89-
}
90-
9171
@Override
9272
public boolean canFillFluidType(FluidStack fluid) {
9373
return canFill() && (this.filter == null || this.filter.test(fluid));

src/main/java/gregtech/api/capability/impl/GTSimpleFluidHandlerItemStack.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,6 @@ public IFluidTankProperties[] getTankProperties() {
6868
return properties;
6969
}
7070

71-
@Override
72-
public FluidStack drain(FluidStack resource, boolean doDrain) {
73-
FluidStack drained = super.drain(resource, doDrain);
74-
this.removeTagWhenEmpty(doDrain);
75-
return drained;
76-
}
77-
78-
@Override
79-
public FluidStack drain(int maxDrain, boolean doDrain) {
80-
FluidStack drained = super.drain(maxDrain, doDrain);
81-
this.removeTagWhenEmpty(doDrain);
82-
return drained;
83-
}
84-
85-
private void removeTagWhenEmpty(boolean doDrain) {
86-
if (doDrain && this.getFluid() == null) {
87-
this.container.setTagCompound(null);
88-
}
89-
}
90-
9171
@Override
9272
public boolean canFillFluidType(FluidStack fluid) {
9373
return canFill() && (this.filter == null || this.filter.test(fluid));

0 commit comments

Comments
 (0)