mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fix #5209; now using FluidStacks everywhere, including all more efficient encodings over network
This commit is contained in:
1 parent
de0ab0d6c9
commit
c92069f716
28 files changed
+131
-244
No files matched your search
@@ -41,7 +41,6 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTank;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
@@ -276,7 +275,7 @@ public class TileEntityPRC extends
|
||||
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
|
||||
if (canFill(from, resource.getFluid())) {
|
||||
if (canFill(from, resource)) {
|
||||
return inputFluidTank.fill(resource, doFill);
|
||||
}
|
||||
|
||||
@@ -294,18 +293,18 @@ public class TileEntityPRC extends
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
public boolean canFill(EnumFacing from, FluidStack fluid) {
|
||||
SideData data = configComponent.getOutput(TransmissionType.FLUID, from, facing);
|
||||
|
||||
if (data.hasSlot(0)) {
|
||||
return inputFluidTank.getFluid() == null || inputFluidTank.getFluid().getFluid() == fluid;
|
||||
return inputFluidTank.getFluid() == null || inputFluidTank.getFluid().isFluidEqual(fluid);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
public boolean canDrain(EnumFacing from, FluidStack fluid) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user