diff --git a/src/main/java/mekanism/common/base/FluidHandlerWrapper.java b/src/main/java/mekanism/common/base/FluidHandlerWrapper.java index 81784882f..c8e8d919e 100644 --- a/src/main/java/mekanism/common/base/FluidHandlerWrapper.java +++ b/src/main/java/mekanism/common/base/FluidHandlerWrapper.java @@ -38,7 +38,7 @@ public class FluidHandlerWrapper implements IFluidHandler { if (side == null) { return 0; } - if (wrapper.canFill(side, resource != null ? resource.getFluid() : null)) { + if (wrapper.canFill(side, resource)) { return wrapper.fill(side, resource, doFill); } @@ -50,7 +50,7 @@ public class FluidHandlerWrapper implements IFluidHandler { if (side == null) { return null; } - if (wrapper.canDrain(side, resource != null ? resource.getFluid() : null)) { + if (wrapper.canDrain(side, resource)) { return wrapper.drain(side, resource, doDrain); } diff --git a/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java b/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java index e144fc2be..0b007ce4d 100644 --- a/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java +++ b/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java @@ -1,7 +1,6 @@ package mekanism.common.base; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -13,9 +12,9 @@ public interface IFluidHandlerWrapper { FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain); - boolean canFill(EnumFacing from, Fluid fluid); + boolean canFill(EnumFacing from, FluidStack fluid); - boolean canDrain(EnumFacing from, Fluid fluid); + boolean canDrain(EnumFacing from, FluidStack fluid); FluidTankInfo[] getTankInfo(EnumFacing from); diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java index 9846e60ef..46f641617 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java +++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java @@ -14,6 +14,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.IntegerInput; import mekanism.common.recipe.machines.AmbientGasRecipe; import mekanism.common.tile.prefab.TileEntityContainerBlock; +import mekanism.common.util.TileUtils; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; @@ -80,27 +81,14 @@ public class TileEntityAmbientAccumulator extends TileEntityContainerBlock imple @Override public TileNetworkList getNetworkedData(TileNetworkList data) { - if (collectedGas.getGasType() != null) { - data.add(collectedGas.getGasType().getID()); - data.add(collectedGas.getStored()); - } else { - data.add(-1); - data.add(0); - } - + TileUtils.addTankData(data, collectedGas); return data; } @Override public void handlePacketData(ByteBuf data) { if (FMLCommonHandler.instance().getEffectiveSide().isClient()) { - int gasID = data.readInt(); - - if (gasID < 0) { - collectedGas.setGas(null); - } else { - collectedGas.setGas(new GasStack(gasID, data.readInt())); - } + TileUtils.readTankData(data, collectedGas); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index a3149e98c..8c9eda1a4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -19,6 +19,7 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.TileUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -207,21 +208,8 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock= structure.upperRenderLocation.y - 1; } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index ea73c095c..27cde731b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -39,7 +39,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -312,7 +311,7 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if (canFill(from, resource.getFluid())) { + if (canFill(from, resource)) { return fluidTank.fill(resource, doFill); } @@ -330,12 +329,12 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH } @Override - public boolean canFill(EnumFacing from, Fluid fluid) { - return from == EnumFacing.UP && fluid == FluidRegistry.WATER; + public boolean canFill(EnumFacing from, FluidStack fluid) { + return from == EnumFacing.UP && fluid.getFluid().equals(FluidRegistry.WATER); } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) { + public boolean canDrain(EnumFacing from, FluidStack fluid) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 61c0b2593..5053aec47 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -18,6 +18,7 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; +import mekanism.common.util.TileUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -175,13 +176,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock toSend = new HashSet<>(); @@ -213,12 +208,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock 0) { + infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream)); + } if (recipeType != oldRecipe) { setRecipeType(recipeType); @@ -738,12 +740,10 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt data.add(sorting); data.add(upgraded); data.add(lastUsage); - data.add(infuseStored.amount); - if (infuseStored.type != null) { + data.add(infuseStored.amount); + if (infuseStored.amount > 0) { data.add(infuseStored.type.name); - } else { - data.add("null"); } data.add(progress); diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 886729fdb..7f9bd0d6d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -30,6 +30,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; +import mekanism.common.util.TileUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -312,12 +313,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc valveFluid = null; } - if (dataStream.readInt() == 1) { - fluidTank.setFluid(new FluidStack(FluidRegistry.getFluid(PacketHandler.readString(dataStream)), - dataStream.readInt())); - } else { - fluidTank.setFluid(null); - } + TileUtils.readTankData(dataStream, fluidTank); if (prevTier != tier || (updateDelay == 0 && clientActive != isActive)) { updateDelay = general.UPDATE_DELAY; @@ -370,13 +366,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc data.add(FluidRegistry.getFluidName(valveFluid)); } - if (fluidTank.getFluid() != null) { - data.add(1); - data.add(FluidRegistry.getFluidName(fluidTank.getFluid())); - data.add(fluidTank.getFluid().amount); - } else { - data.add(0); - } + TileUtils.addTankData(data, fluidTank); return data; } @@ -452,7 +442,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc return resource != null ? resource.amount : 0; } - if (resource != null && canFill(from, resource.getFluid())) { + if (resource != null && canFill(from, resource)) { int filled = fluidTank.fill(resource, doFill); if (filled < resource.amount && !isActive) { @@ -476,7 +466,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc @Override public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if (resource != null && canDrain(from, resource.getFluid())) { + if (resource != null && canDrain(from, resource)) { return fluidTank.drain(resource.amount, tier != FluidTankTier.CREATIVE && doDrain); } @@ -493,7 +483,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public boolean canFill(EnumFacing from, Fluid fluid) { + public boolean canFill(EnumFacing from, FluidStack fluid) { TileEntity tile = world.getTileEntity(getPos().offset(EnumFacing.DOWN)); if (from == EnumFacing.DOWN && world != null) { if (isActive && !(tile instanceof TileEntityFluidTank)) { @@ -508,16 +498,16 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if (isActive && tile instanceof TileEntityFluidTank) // Only fill if tanks underneath have same fluid. { return (fluidTank.getFluid() == null && ((TileEntityFluidTank) tile).canFill(EnumFacing.UP, fluid)) || - (fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == fluid); + (fluidTank.getFluid() != null && fluidTank.getFluid().isFluidEqual(fluid)); } - return fluidTank.getFluid() == null || fluidTank.getFluid().getFluid() == fluid; + return fluidTank.getFluid() == null || fluidTank.getFluid().isFluidEqual(fluid); } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) { + public boolean canDrain(EnumFacing from, FluidStack fluid) { if (fluidTank != null) { - if (fluid == null || fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == fluid) { + if (fluid == null || fluidTank.getFluid() != null && fluidTank.getFluid().isFluidEqual(fluid)) { return !(isActive && from == EnumFacing.DOWN); } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 176c2c253..9b1033399 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -31,6 +31,7 @@ import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; +import mekanism.common.util.TileUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -205,12 +206,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen finishedCalc = dataStream.readBoolean(); controlType = RedstoneControl.values()[dataStream.readInt()]; - if (dataStream.readInt() == 1) { - fluidTank.setFluid(new FluidStack(FluidRegistry.getFluid(ByteBufUtils.readUTF8String(dataStream)), - dataStream.readInt())); - } else { - fluidTank.setFluid(null); - } + TileUtils.readTankData(dataStream, fluidTank); } } @@ -221,13 +217,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen data.add(finishedCalc); data.add(controlType.ordinal()); - if (fluidTank.getFluid() != null) { - data.add(1); - data.add(FluidRegistry.getFluidName(fluidTank.getFluid())); - data.add(fluidTank.getFluid().amount); - } else { - data.add(0); - } + TileUtils.addTankData(data, fluidTank); return data; } @@ -398,12 +388,12 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public boolean canFill(EnumFacing from, Fluid fluid) { - return from == EnumFacing.UP && fluid.canBePlacedInWorld(); + public boolean canFill(EnumFacing from, FluidStack fluid) { + return from == EnumFacing.UP && fluid.getFluid().canBePlacedInWorld(); } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) { + public boolean canDrain(EnumFacing from, FluidStack fluid) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 90d136651..3c4125f34 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -288,7 +288,9 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i if (FMLCommonHandler.instance().getEffectiveSide().isClient()) { infuseStored.amount = dataStream.readInt(); - infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream)); + if (infuseStored.amount > 0) { + infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream)); + } } } @@ -297,11 +299,8 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i super.getNetworkedData(data); data.add(infuseStored.amount); - - if (infuseStored.type != null) { + if (infuseStored.amount > 0) { data.add(infuseStored.type.name); - } else { - data.add("null"); } return data; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 107f14d6c..66539268f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -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; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 0c34bea88..39b09f399 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -55,7 +55,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.ChunkPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -428,20 +427,20 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public boolean canFill(EnumFacing from, Fluid fluid) { + public boolean canFill(EnumFacing from, FluidStack fluid) { if (hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState == IOState.INPUT) { - return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); + return frequency.storedFluid.getFluid() == null || frequency.storedFluid.getFluid().isFluidEqual(fluid); } return false; } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) { + public boolean canDrain(EnumFacing from, FluidStack fluid) { if (hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState == IOState.OUTPUT) { - return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); + return frequency.storedFluid.getFluid() == null || frequency.storedFluid.getFluid().isFluidEqual(fluid); } return false; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 455c47b5b..afff5b2ac 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -37,7 +37,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; 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; @@ -295,7 +294,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if (canFill(from, resource.getFluid())) { + if (canFill(from, resource)) { return fluidTank.fill(resource, doFill); } @@ -312,13 +311,13 @@ public class TileEntityRotaryCondensentrator extends TileEntityMachine implement } @Override - public boolean canFill(EnumFacing from, Fluid fluid) { + public boolean canFill(EnumFacing from, FluidStack fluid) { return mode == 1 && from == MekanismUtils.getRight(facing) && (fluidTank.getFluid() == null ? isValidFluid( - new FluidStack(fluid, 1)) : fluidTank.getFluid().getFluid() == fluid); + new FluidStack(fluid, 1)) : fluidTank.getFluid().isFluidEqual(fluid)); } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) { + public boolean canDrain(EnumFacing from, FluidStack fluid) { return mode == 0 && from == MekanismUtils.getRight(facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index 8892c9235..24120a99d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -10,7 +10,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -69,13 +68,13 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public boolean canFill(EnumFacing from, Fluid fluid) { + public boolean canFill(EnumFacing from, FluidStack fluid) { TileEntityThermalEvaporationController controller = getController(); - return controller != null && controller.hasRecipe(fluid); + return controller != null && controller.hasRecipe(fluid.getFluid()); } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) { + public boolean canDrain(EnumFacing from, FluidStack fluid) { TileEntityThermalEvaporationController controller = getController(); return controller != null && controller.outputTank.getFluidAmount() > 0; } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index bfba968f3..f43f480a1 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -216,12 +216,12 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter teslaManager = new CapabilityWrapperManager<>( IEnergyWrapper.class, TeslaIntegration.class); private CapabilityWrapperManager forgeEnergyManager = new CapabilityWrapperManager<>( @@ -320,7 +319,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if (resource == null || !canFill(from, resource.getFluid())) { + if (resource == null || !canFill(from, resource)) { return 0; } @@ -348,8 +347,8 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean canFill(EnumFacing from, Fluid fluid) { - if (fluid == STEAM) { + public boolean canFill(EnumFacing from, FluidStack fluid) { + if (fluid.getFluid().equals(FluidRegistry.getFluid("steam"))) { return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)); } @@ -357,7 +356,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) { + public boolean canDrain(EnumFacing from, FluidStack fluid) { return false; } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java index d67e1ebe6..15c59a0b0 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java @@ -9,7 +9,6 @@ import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -74,13 +73,13 @@ public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IF } @Override - public boolean canFill(EnumFacing from, Fluid fluid) { + public boolean canFill(EnumFacing from, FluidStack fluid) { return false; } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) { - return fluid == FluidRegistry.WATER; + public boolean canDrain(EnumFacing from, FluidStack fluid) { + return fluid.getFluid().equals(FluidRegistry.WATER); } @Override