From 6d02ea682bee16d2fe20d74742dce74fb0584a40 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 29 Jun 2016 10:32:11 -0400 Subject: [PATCH 1/3] Loads of work on new fluid system. Still needs polishing --- src/main/java/mekanism/common/FluidSlot.java | 9 +- .../content/boiler/BoilerSteamTank.java | 6 ++ .../common/content/boiler/BoilerTank.java | 33 ++++++- .../content/boiler/BoilerWaterTank.java | 13 +++ .../common/content/tank/DynamicFluidTank.java | 33 ++++++- .../common/tile/TileEntityBoilerValve.java | 53 ++++++----- .../common/tile/TileEntityChemicalWasher.java | 62 ++++++------- .../common/tile/TileEntityDynamicValve.java | 67 ++++++++------ .../common/tile/TileEntityElectricPump.java | 65 +++++--------- .../tile/TileEntityFluidicPlenisher.java | 65 ++++++-------- .../common/tile/TileEntityInductionPort.java | 7 +- .../tile/TileEntityQuantumEntangloporter.java | 83 +++++++++--------- .../tile/TileEntityRotaryCondensentrator.java | 75 ++++++---------- ...ileEntityThermalEvaporationController.java | 11 ++- .../TileEntityThermalEvaporationValve.java | 44 +++------- .../java/mekanism/common/util/PipeUtils.java | 3 +- .../content/turbine/TurbineFluidTank.java | 34 +++++++- .../common/tile/TileEntityBioGenerator.java | 87 ++++++++++++++----- .../common/tile/TileEntityHeatGenerator.java | 52 ++++++----- .../tile/turbine/TileEntityTurbineValve.java | 50 +++++------ 20 files changed, 473 insertions(+), 379 deletions(-) diff --git a/src/main/java/mekanism/common/FluidSlot.java b/src/main/java/mekanism/common/FluidSlot.java index 38ff5b9eb..7f7b30ebb 100644 --- a/src/main/java/mekanism/common/FluidSlot.java +++ b/src/main/java/mekanism/common/FluidSlot.java @@ -14,18 +14,13 @@ public class FluidSlot /** The maximum amount of fluid this slot can handle. */ public int MAX_FLUID; - /** The fluid's ID. */ - public int fluidID; - /** - * Creates a FluidSlot with a defined fluid ID and max fluid. The fluid stored starts at 0. + * Creates a FluidSlot with a defined max fluid. The fluid stored starts at 0. * @param max - max fluid - * @param id - fluid id */ - public FluidSlot(int max, int id) + public FluidSlot(int max) { MAX_FLUID = max; - fluidID = id; } /** diff --git a/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java b/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java index 32086fd6f..fbc0e3219 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java @@ -27,4 +27,10 @@ public class BoilerSteamTank extends BoilerTank { return steamBoiler.structure != null ? steamBoiler.structure.steamVolume*BoilerUpdateProtocol.STEAM_PER_TANK : 0; } + + @Override + public boolean canDrain() + { + return steamBoiler.structure.upperRenderLocation != null && steamBoiler.getPos().getY() >= steamBoiler.structure.upperRenderLocation.yCoord-1; + } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerTank.java b/src/main/java/mekanism/common/content/boiler/BoilerTank.java index a08564595..2b89509f2 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerTank.java @@ -7,8 +7,9 @@ import mekanism.common.util.MekanismUtils; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.IFluidTankProperties; -public abstract class BoilerTank implements IFluidTank +public abstract class BoilerTank implements IFluidTank, IFluidTankProperties { public TileEntityBoilerCasing steamBoiler; @@ -180,4 +181,34 @@ public abstract class BoilerTank implements IFluidTank { return new FluidTankInfo(this); } + + @Override + public FluidStack getContents() + { + return getFluid() != null ? getFluid().copy() : null; + } + + @Override + public boolean canFill() + { + return false; + } + + @Override + public boolean canDrain() + { + return false; + } + + @Override + public boolean canFillFluidType(FluidStack fluidStack) + { + return canFill(); + } + + @Override + public boolean canDrainFluidType(FluidStack fluidStack) + { + return canDrain(); + } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java b/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java index ec1aab932..717348160 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java @@ -1,6 +1,7 @@ package mekanism.common.content.boiler; import mekanism.common.tile.TileEntityBoilerCasing; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class BoilerWaterTank extends BoilerTank @@ -27,4 +28,16 @@ public class BoilerWaterTank extends BoilerTank { return steamBoiler.structure != null ? steamBoiler.structure.waterVolume*BoilerUpdateProtocol.WATER_PER_TANK : 0; } + + @Override + public boolean canFill() + { + return steamBoiler.structure.upperRenderLocation != null && steamBoiler.getPos().getY() < steamBoiler.structure.upperRenderLocation.yCoord-1; + } + + @Override + public boolean canFillFluidType(FluidStack fluid) + { + return canFill() && fluid.getFluid() == FluidRegistry.WATER; + } } diff --git a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java index 8c5bc60f3..049f12a48 100644 --- a/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java +++ b/src/main/java/mekanism/common/content/tank/DynamicFluidTank.java @@ -7,8 +7,9 @@ import mekanism.common.util.MekanismUtils; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.IFluidTankProperties; -public class DynamicFluidTank implements IFluidTank +public class DynamicFluidTank implements IFluidTank, IFluidTankProperties { public TileEntityDynamicTank dynamicTank; @@ -194,4 +195,34 @@ public class DynamicFluidTank implements IFluidTank { return new FluidTankInfo(this); } + + @Override + public FluidStack getContents() + { + return getFluid() != null ? getFluid().copy() : null; + } + + @Override + public boolean canFill() + { + return true; + } + + @Override + public boolean canDrain() + { + return true; + } + + @Override + public boolean canFillFluidType(FluidStack fluidStack) + { + return canFill(); + } + + @Override + public boolean canDrainFluidType(FluidStack fluidStack) + { + return canDrain(); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java index 303283a75..eabacbb54 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java @@ -1,16 +1,19 @@ package mekanism.common.tile; import mekanism.api.Coord4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.content.boiler.BoilerSteamTank; import mekanism.common.content.boiler.BoilerTank; import mekanism.common.content.boiler.BoilerWaterTank; 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.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFluidHandler { @@ -40,11 +43,13 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { TileEntity tile = Coord4D.get(this).offset(side).getTileEntity(worldObj); - if(tile instanceof IFluidHandler && !(tile instanceof TileEntityBoilerValve)) + if(tile != null && !(tile instanceof TileEntityBoilerValve) && CapabilityUtils.hasCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite())) { - if(((IFluidHandler)tile).canFill(side.getOpposite(), structure.steamStored.getFluid())) + IFluidHandler handler = CapabilityUtils.getCapability(tile, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side.getOpposite()); + + if(PipeUtils.canFill(handler, structure.steamStored)) { - structure.steamStored.amount -= ((IFluidHandler)tile).fill(side.getOpposite(), structure.steamStored, true); + structure.steamStored.amount -= handler.fill(structure.steamStored, true); if(structure.steamStored.amount <= 0) { @@ -59,16 +64,16 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) + public IFluidTankProperties[] getTankProperties() { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) { - return new FluidTankInfo[] {steamTank.getInfo()}; + return new IFluidTankProperties[] {steamTank}; } else { - return new FluidTankInfo[] {waterTank.getInfo()}; + return new IFluidTankProperties[] {waterTank}; } } @@ -76,9 +81,9 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord-1) + if(structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord-1) { return waterTank.fill(resource, doFill); } @@ -87,9 +92,9 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) + if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) { if(structure.steamStored != null) { @@ -104,35 +109,41 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) + if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1) { return steamTank.drain(maxDrain, doDrain); } return null; } - + @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public boolean hasCapability(Capability capability, EnumFacing side) { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord-1; + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + { + return true; + } } - return false; + return super.hasCapability(capability, side); } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) + public T getCapability(Capability capability, EnumFacing side) { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord-1; + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + { + return (T)this; + } } - return false; + return super.getCapability(capability, side); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index c41e19466..90de406d3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -40,26 +40,39 @@ import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, IFluidHandler, IUpgradeTile, ISustainedData, IUpgradeInfoHandler, ITankManager, ISecurityTile { - public FluidTank fluidTank = new FluidTank(MAX_FLUID); + public FluidTank fluidTank = new FluidTank(MAX_FLUID) { + @Override + public boolean canFillFluidType(FluidStack fluid) + { + return fluid.getFluid() == FluidRegistry.WATER; + } + + @Override + public boolean canDrain() + { + return false; + } + }; + public GasTank inputTank = new GasTank(MAX_GAS); public GasTank outputTank = new GasTank(MAX_GAS); @@ -512,13 +525,14 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple public boolean hasCapability(Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY - || super.hasCapability(capability, side); + || (side == EnumFacing.UP && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) + if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || + (side == EnumFacing.UP && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)) { return (T)this; } @@ -527,49 +541,27 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { - if(canFill(from, resource.getFluid())) - { - return fluidTank.fill(resource, doFill); - } - - return 0; + return fluidTank.fill(resource, doFill); } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { return null; } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { return null; } @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public IFluidTankProperties[] getTankProperties() { - return from == EnumFacing.UP && fluid == FluidRegistry.WATER; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) - { - if(from == EnumFacing.UP) - { - return new FluidTankInfo[] {fluidTank.getInfo()}; - } - - return PipeUtils.EMPTY; + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank)}; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java index 9c7f4c686..fb344edc7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java @@ -2,12 +2,12 @@ package mekanism.common.tile; import mekanism.common.content.tank.DynamicFluidTank; import mekanism.common.util.LangUtils; -import mekanism.common.util.PipeUtils; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFluidHandler { @@ -20,21 +20,21 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl } @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) + public IFluidTankProperties[] getTankProperties() { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : PipeUtils.EMPTY; + return new IFluidTankProperties[] {fluidTank}; } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { return fluidTank.fill(resource, doFill); } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { - if(structure != null && structure.fluidStored != null) + if(structure.fluidStored != null) { if(resource.getFluid() == structure.fluidStored.getFluid()) { @@ -46,26 +46,9 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { - if(structure != null) - { - return fluidTank.drain(maxDrain, doDrain); - } - - return null; - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid) - { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); + return fluidTank.drain(maxDrain, doDrain); } @Override @@ -73,4 +56,32 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl { return LangUtils.localize("gui.dynamicTank"); } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + { + return true; + } + } + + return super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + { + return (T)this; + } + } + + return super.getCapability(capability, side); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 7e075c8a1..ca3fb2682 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -15,6 +15,7 @@ import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; +import mekanism.api.util.CapabilityUtils; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; @@ -29,7 +30,6 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.PipeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -45,9 +45,11 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; @@ -154,10 +156,11 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { TileEntity tileEntity = Coord4D.get(this).offset(EnumFacing.UP).getTileEntity(worldObj); - if(tileEntity instanceof IFluidHandler) + if(tileEntity != null && CapabilityUtils.hasCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN)) { + IFluidHandler handler = CapabilityUtils.getCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN); FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(256*(upgradeComponent.getUpgrades(Upgrade.SPEED)+1), fluidTank.getFluidAmount())); - fluidTank.drain(((IFluidHandler)tileEntity).fill(EnumFacing.DOWN, toDrain, true), true); + fluidTank.drain(handler.fill(toDrain, true), true); } } } @@ -441,14 +444,15 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public FluidTankInfo[] getTankInfo(EnumFacing direction) + public IFluidTankProperties[] getTankProperties() { - if(direction == EnumFacing.UP) - { - return new FluidTankInfo[] {fluidTank.getInfo()}; - } - - return PipeUtils.EMPTY; + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank) { + @Override + public boolean canFill() + { + return false; + } + }}; } @Override @@ -470,43 +474,21 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() && from == EnumFacing.getFront(1)) - { - return drain(from, resource.amount, doDrain); - } - - return null; + return fluidTank.drain(resource, doDrain); } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { return 0; } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { - if(from == EnumFacing.getFront(1)) - { - return fluidTank.drain(maxDrain, doDrain); - } - - return null; - } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid) - { - return false; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return from == EnumFacing.getFront(1); + return fluidTank.drain(maxDrain, doDrain); } @Override @@ -528,13 +510,14 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I @Override public boolean hasCapability(Capability capability, EnumFacing side) { - return capability == Capabilities.CONFIGURABLE_CAPABILITY || super.hasCapability(capability, side); + return capability == Capabilities.CONFIGURABLE_CAPABILITY || + (side == EnumFacing.UP && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.CONFIGURABLE_CAPABILITY) + if(capability == Capabilities.CONFIGURABLE_CAPABILITY || (side == EnumFacing.UP && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)) { return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index ba8a78744..3bfc27625 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -27,7 +27,6 @@ import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.PipeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -42,9 +41,11 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; @@ -419,14 +420,21 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public FluidTankInfo[] getTankInfo(EnumFacing direction) + public IFluidTankProperties[] getTankProperties() { - if(direction == EnumFacing.UP) - { - return new FluidTankInfo[] {fluidTank.getInfo()}; - } - - return PipeUtils.EMPTY; + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank) { + @Override + public boolean canDrain() + { + return false; + } + + @Override + public boolean canFillFluidType(FluidStack fluid) + { + return fluid.getFluid().canBePlacedInWorld(); + } + }}; } @Override @@ -448,43 +456,21 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) - { - if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid() && from == EnumFacing.UP) - { - return drain(from, resource.amount, doDrain); - } - - return null; - } - - @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) - { - if(from == EnumFacing.UP && resource.getFluid().canBePlacedInWorld()) - { - return fluidTank.fill(resource, true); - } - - return 0; - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public int fill(FluidStack resource, boolean doFill) { - return from == EnumFacing.UP && fluid.canBePlacedInWorld(); + return fluidTank.fill(resource, true); } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) + public FluidStack drain(int maxDrain, boolean doDrain) { - return false; + return null; } @Override @@ -508,13 +494,14 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen @Override public boolean hasCapability(Capability capability, EnumFacing side) { - return capability == Capabilities.CONFIGURABLE_CAPABILITY || super.hasCapability(capability, side); + return capability == Capabilities.CONFIGURABLE_CAPABILITY || + (side == EnumFacing.UP && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.CONFIGURABLE_CAPABILITY) + if(capability == Capabilities.CONFIGURABLE_CAPABILITY || (side == EnumFacing.UP && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)) { return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index fefa18125..415e4e30c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -488,6 +488,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY + || capability == Capabilities.CONFIGURABLE_CAPABILITY || super.hasCapability(capability, facing); } @@ -495,9 +496,9 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement public T getCapability(Capability capability, EnumFacing facing) { if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY) - return (T) this; - if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY) - return (T) this; + return (T)this; + if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY) + return (T)this; return super.getCapability(capability, facing); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index aaa74f6d5..58bf76213 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -39,10 +39,11 @@ import net.minecraft.nbt.NBTTagCompound; 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.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandler, IFrequencyHandler, IGasHandler, IHeatTransfer, ITubeConnection, IComputerIntegration, ISecurityTile @@ -402,15 +403,15 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { - return !hasFrequency() ? 0 : frequency.storedFluid.fill(resource, doFill); + return frequency.storedFluid.fill(resource, doFill); } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { - if(hasFrequency() && resource.isFluidEqual(frequency.storedFluid.getFluid())) + if(resource.isFluidEqual(frequency.storedFluid.getFluid())) { return frequency.storedFluid.drain(resource.amount, doDrain); } @@ -419,47 +420,39 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { - if(hasFrequency()) - { - return frequency.storedFluid.drain(maxDrain, doDrain); - } - - return null; + return frequency.storedFluid.drain(maxDrain, doDrain); } @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public IFluidTankProperties[] getTankProperties() { - if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState == IOState.INPUT) + if(configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing).ioState != IOState.OFF) { - return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); - } - - return false; - } + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(frequency.storedFluid) { + @Override + public boolean canFillFluidType(FluidStack fluid) + { + if(configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing).ioState == IOState.INPUT) + { + return frequency.storedFluid.getFluid() == null || fluid.getFluid() == frequency.storedFluid.getFluid().getFluid(); + } + + return false; + } - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState == IOState.OUTPUT) - { - return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); - } - - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) - { - if(hasFrequency()) - { - if(configComponent.getOutput(TransmissionType.FLUID, from, facing).ioState != IOState.OFF) - { - return new FluidTankInfo[] {frequency.storedFluid.getInfo()}; - } + @Override + public boolean canDrainFluidType(FluidStack fluid) + { + if(configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing).ioState == IOState.OUTPUT) + { + return frequency.storedFluid.getFluid() == null || fluid.getFluid() == frequency.storedFluid.getFluid().getFluid(); + } + + return false; + } + }}; } return PipeUtils.EMPTY; @@ -660,19 +653,23 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return frequency != null && configComponent.getOutput(TransmissionType.GAS, side, facing).ioState != IOState.OFF; } + private EnumFacing capabilitySide = EnumFacing.NORTH; + @Override public boolean hasCapability(Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY - || capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + || capability == Capabilities.HEAT_TRANSFER_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY + || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY - || capability == Capabilities.HEAT_TRANSFER_CAPABILITY) + || capability == Capabilities.HEAT_TRANSFER_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { + capabilitySide = side; return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 6a4b12c1b..2ed6f3e5f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -34,7 +34,6 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.PipeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -42,14 +41,15 @@ import net.minecraft.nbt.NBTTagCompound; 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.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; @@ -57,7 +57,19 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { public GasTank gasTank = new GasTank(MAX_FLUID); - public FluidTank fluidTank = new FluidTank(MAX_FLUID); + public FluidTank fluidTank = new FluidTank(MAX_FLUID) { + @Override + public boolean canFillFluidType(FluidStack fluid) + { + return mode == 1 && (fluidTank.getFluid() == null ? isValidFluid(new FluidStack(fluid, 1)) : fluidTank.getFluid().getFluid() == fluid.getFluid()); + } + + @Override + public boolean canDrainFluidType(FluidStack fluid) + { + return mode == 0; + } + }; public static final int MAX_FLUID = 10000; @@ -448,13 +460,14 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp public boolean hasCapability(Capability capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY - || super.hasCapability(capability, side); + || (side == MekanismUtils.getRight(facing) && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) + if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || + (side == MekanismUtils.getRight(facing) && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)) { return (T)this; } @@ -484,59 +497,27 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { - if(canFill(from, resource.getFluid())) - { - return fluidTank.fill(resource, doFill); - } - - return 0; + return fluidTank.fill(resource, doFill); } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == resource.getFluid()) - { - return drain(from, resource.amount, doDrain); - } - - return null; + return drain(resource.amount, doDrain); } @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public IFluidTankProperties[] getTankProperties() { - return mode == 1 && from == MekanismUtils.getRight(facing) && (fluidTank.getFluid() == null ? isValidFluid(new FluidStack(fluid, 1)) : fluidTank.getFluid().getFluid() == fluid); + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank)}; } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) + public FluidStack drain(int maxDrain, boolean doDrain) { - return mode == 0 && from == MekanismUtils.getRight(facing); - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) - { - if(from == MekanismUtils.getRight(facing)) - { - return new FluidTankInfo[] {fluidTank.getInfo()}; - } - - return PipeUtils.EMPTY; - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) - { - if(canDrain(from, null)) - { - return fluidTank.drain(maxDrain, doDrain); - } - - return null; + return fluidTank.drain(maxDrain, doDrain); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 57030357f..eaaaa7ae6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -48,7 +48,13 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public static final int MAX_SOLARS = 4; public static final int MAX_HEIGHT = 18; - public FluidTank inputTank = new FluidTank(0); + public FluidTank inputTank = new FluidTank(0) { + @Override + public boolean canFillFluidType(FluidStack fluid) + { + return hasRecipe(fluid.getFluid()); + } + }; public FluidTank outputTank = new FluidTank(MAX_OUTPUT); public Set tankParts = new HashSet(); @@ -88,6 +94,9 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva super("ThermalEvaporationController"); inventory = new ItemStack[4]; + + inputTank.setCanDrain(false); + outputTank.setCanFill(false); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index 89fb5a78d..b77ae9198 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -6,10 +6,10 @@ import mekanism.common.capabilities.Capabilities; 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.IFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporationBlock implements IFluidHandler, IHeatTransfer { @@ -40,18 +40,17 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { - TileEntityThermalEvaporationController controller = getController(); - return controller == null ? 0 : controller.inputTank.fill(resource, doFill); + return getController().inputTank.fill(resource, doFill); } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { TileEntityThermalEvaporationController controller = getController(); - if(controller != null && (resource == null || resource.isFluidEqual(controller.outputTank.getFluid()))) + if(resource == null || resource.isFluidEqual(controller.outputTank.getFluid())) { return controller.outputTank.drain(resource.amount, doDrain); } @@ -60,34 +59,13 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { - TileEntityThermalEvaporationController controller = getController(); - - if(controller != null) - { - return controller.outputTank.drain(maxDrain, doDrain); - } - - return null; + return getController().outputTank.drain(maxDrain, doDrain); } @Override - public boolean canFill(EnumFacing from, Fluid fluid) - { - TileEntityThermalEvaporationController controller = getController(); - return controller != null && controller.hasRecipe(fluid); - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - TileEntityThermalEvaporationController controller = getController(); - return controller != null && controller.outputTank.getFluidAmount() > 0; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) + public IFluidTankProperties[] getTankProperties() { TileEntityThermalEvaporationController controller = getController(); @@ -96,7 +74,7 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat return PipeUtils.EMPTY; } - return new FluidTankInfo[] {new FluidTankInfo(controller.inputTank), new FluidTankInfo(controller.outputTank)}; + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(controller.inputTank), new FluidTankPropertiesWrapper(controller.outputTank)}; } @Override diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index d1a0ef276..648f7c7a9 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -12,14 +12,13 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; public final class PipeUtils { - public static final FluidTankInfo[] EMPTY = new FluidTankInfo[] {}; + public static final IFluidTankProperties[] EMPTY = new IFluidTankProperties[] {}; public static boolean isValidAcceptorOnSide(TileEntity tile, EnumFacing side) { diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java index 795268bc7..c81dc287b 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java @@ -2,11 +2,13 @@ package mekanism.generators.common.content.turbine; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.IFluidTankProperties; -public class TurbineFluidTank implements IFluidTank +public class TurbineFluidTank implements IFluidTank, IFluidTankProperties { public TileEntityTurbineCasing turbine; @@ -174,4 +176,34 @@ public class TurbineFluidTank implements IFluidTank { return new FluidTankInfo(this); } + + @Override + public FluidStack getContents() + { + return getFluid() != null ? getFluid().copy() : null; + } + + @Override + public boolean canFill() + { + return true; + } + + @Override + public boolean canDrain() + { + return true; + } + + @Override + public boolean canFillFluidType(FluidStack fluidStack) + { + return fluidStack.getFluid() == FluidRegistry.getFluid("steam"); + } + + @Override + public boolean canDrainFluidType(FluidStack fluidStack) + { + return canDrain(); + } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 04db870c5..27a5623c1 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -14,18 +14,19 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityBioGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData { /** The FluidSlot biofuel instance for this generator. */ - public FluidSlot bioFuelSlot = new FluidSlot(24000, -1); + public FluidSlot bioFuelSlot = new FluidSlot(24000); public TileEntityBioGenerator() { @@ -249,9 +250,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { - if(FluidRegistry.isFluidRegistered("bioethanol") && from != facing) + if(FluidRegistry.isFluidRegistered("bioethanol")) { if(resource.getFluid() == FluidRegistry.getFluid("bioethanol")) { @@ -280,33 +281,62 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { return null; } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public IFluidTankProperties[] getTankProperties() { - return FluidRegistry.isFluidRegistered("bioethanol") && fluid == FluidRegistry.getFluid("bioethanol"); - } + return new IFluidTankProperties[] {new IFluidTankProperties() { + @Override + public FluidStack getContents() + { + if(FluidRegistry.isFluidRegistered("bioethanol")) + { + return new FluidStack(FluidRegistry.getFluid("bioethanol"), bioFuelSlot.fluidStored); + } + + return null; + } - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return false; - } + @Override + public int getCapacity() + { + return bioFuelSlot.MAX_FLUID; + } - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) - { - return null; + @Override + public boolean canFill() + { + return true; + } + + @Override + public boolean canDrain() + { + return false; + } + + @Override + public boolean canFillFluidType(FluidStack fluidStack) + { + return FluidRegistry.isFluidRegistered("bioethanol") && fluidStack.getFluid() == FluidRegistry.getFluid("bioethanol"); + } + + @Override + public boolean canDrainFluidType(FluidStack fluidStack) + { + return false; + } + }}; } @Override @@ -320,4 +350,21 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui { bioFuelSlot.setFluid(ItemDataUtils.getInt(itemStack, "fluidStored")); } + + @Override + public boolean hasCapability(Capability capability, EnumFacing side) + { + return (side != facing && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) || super.hasCapability(capability, side); + } + + @Override + public T getCapability(Capability capability, EnumFacing side) + { + if(side != facing && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + { + return (T)this; + } + + return super.getCapability(capability, side); + } } \ No newline at end of file diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 825fba93d..6e960991f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -16,7 +16,6 @@ import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.HeatUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.PipeUtils; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -31,9 +30,11 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityHeatGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData, IHeatTransfer @@ -343,9 +344,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { - if(resource.getFluid() == FluidRegistry.LAVA && from != facing) + if(resource.getFluid() == FluidRegistry.LAVA) { return lavaTank.fill(resource, doFill); } @@ -354,38 +355,33 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { return null; } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public IFluidTankProperties[] getTankProperties() { - return fluid == FluidRegistry.LAVA && from != facing; - } + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(lavaTank) { + @Override + public boolean canFillFluidType(FluidStack fluid) + { + return fluid != null && fluid.getFluid() == FluidRegistry.LAVA; + } - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return false; - } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) - { - if(from == facing) - { - return PipeUtils.EMPTY; - } - - return new FluidTankInfo[] {lavaTank.getInfo()}; + @Override + public boolean canDrainFluidType(FluidStack fluid) + { + return false; + } + }}; } @Override @@ -476,13 +472,15 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override public boolean hasCapability(Capability capability, EnumFacing side) { - return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || + (side != facing && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) || super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY) + if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY || + (side != facing && capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)) { return (T)this; } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index db7d86ac6..d5eec448c 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -16,17 +16,15 @@ import mekanism.common.base.IEnergyWrapper; import mekanism.common.util.CableUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.PipeUtils; import mekanism.generators.common.content.turbine.TurbineFluidTank; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; 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; -import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; @@ -340,13 +338,13 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) + public IFluidTankProperties[] getTankProperties() { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : PipeUtils.EMPTY; + return new IFluidTankProperties[] {fluidTank}; } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { int filled = fluidTank.fill(resource, doFill); @@ -359,7 +357,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { if(structure != null && structure.fluidStored != null) { @@ -373,7 +371,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { if(structure != null) { @@ -382,23 +380,6 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I return null; } - - @Override - public boolean canFill(EnumFacing from, Fluid fluid) - { - if(fluid == FluidRegistry.getFluid("steam")) - { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); - } - - return false; - } - - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); - } @Override public String getName() @@ -409,15 +390,26 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public boolean hasCapability(Capability capability, EnumFacing side) { - return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + { + return true; + } + } + + return super.hasCapability(capability, side); } @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return (T)this; + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + { + return (T)this; + } } return super.getCapability(capability, side); From 3973c70feb9db6d6802443fb4d41b89504c309be Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 29 Jun 2016 11:18:08 -0400 Subject: [PATCH 2/3] More fluid upgrading. TileEntity integration is about done --- src/main/java/mekanism/common/SideData.java | 17 ++-- .../common/tile/TileEntityElectricPump.java | 16 ++-- .../tile/TileEntityElectrolyticSeparator.java | 49 +++++------ .../common/tile/TileEntityFluidTank.java | 83 +++++++++++-------- .../tile/TileEntityFluidicPlenisher.java | 28 +++---- .../mekanism/common/tile/TileEntityPRC.java | 73 ++++++++-------- .../tile/TileEntityQuantumEntangloporter.java | 64 ++++++++------ .../tile/TileEntityRotaryCondensentrator.java | 2 +- .../TileEntityThermalEvaporationValve.java | 25 +++--- .../common/tile/TileEntityBioGenerator.java | 2 +- .../common/tile/TileEntityHeatGenerator.java | 8 +- .../tile/turbine/TileEntityTurbineValve.java | 12 +-- 12 files changed, 193 insertions(+), 186 deletions(-) diff --git a/src/main/java/mekanism/common/SideData.java b/src/main/java/mekanism/common/SideData.java index 68a174dcc..57ef8ba0f 100644 --- a/src/main/java/mekanism/common/SideData.java +++ b/src/main/java/mekanism/common/SideData.java @@ -7,8 +7,9 @@ import mekanism.api.EnumColor; import mekanism.api.gas.GasTank; import mekanism.common.base.ITankManager; import mekanism.common.util.LangUtils; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidTankProperties; public class SideData { @@ -59,25 +60,25 @@ public class SideData return false; } - public FluidTankInfo[] getFluidTankInfo(ITankManager manager) + public IFluidTankProperties[] getTankProperties(ITankManager manager) { Object[] tanks = manager.getTanks(); - List infos = new ArrayList(); + List infos = new ArrayList(); if(tanks == null) { - return infos.toArray(new FluidTankInfo[] {}); + return infos.toArray(new IFluidTankProperties[] {}); } for(int slot : availableSlots) { - if(slot <= tanks.length-1 && tanks[slot] instanceof IFluidTank) + if(slot <= tanks.length-1 && tanks[slot] instanceof FluidTank) { - infos.add(((IFluidTank)tanks[slot]).getInfo()); + infos.add(new FluidTankPropertiesWrapper(((FluidTank)tanks[slot]))); } } - return infos.toArray(new FluidTankInfo[] {}); + return infos.toArray(new IFluidTankProperties[] {}); } public GasTank getGasTank(ITankManager manager) diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index ca3fb2682..997cb616c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -56,7 +56,13 @@ import net.minecraftforge.fml.common.network.ByteBufUtils; public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IConfigurable, IRedstoneControl, IUpgradeTile, ITankManager, IComputerIntegration, ISecurityTile { /** This pump's tank */ - public FluidTank fluidTank = new FluidTank(10000); + public FluidTank fluidTank = new FluidTank(10000) { + @Override + public boolean canFill() + { + return false; + } + }; /** The type of fluid this pump is pumping */ public Fluid activeType; @@ -446,13 +452,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I @Override public IFluidTankProperties[] getTankProperties() { - return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank) { - @Override - public boolean canFill() - { - return false; - } - }}; + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank)}; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 0fda9c735..37e6dc416 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -47,21 +47,33 @@ import net.minecraft.nbt.NBTTagCompound; 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.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IFluidHandler, IComputerIntegration, ITubeConnection, ISustainedData, IGasHandler, IUpgradeTile, IUpgradeInfoHandler, ITankManager, IRedstoneControl, IActiveState, ISecurityTile { /** This separator's water slot. */ - public FluidTank fluidTank = new FluidTank(24000); + public FluidTank fluidTank = new FluidTank(24000) { + @Override + public boolean canFillFluidType(FluidStack fluid) + { + return Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(fluid.getFluid()); + } + + @Override + public boolean canDrain() + { + return false; + } + }; /** The maximum amount of gas this block can store. */ public int MAX_GAS = 2400; @@ -612,44 +624,27 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { return null; } @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public int fill(FluidStack resource, boolean doFill) { - return Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(fluid); + return fluidTank.fill(resource, doFill); } @Override - public boolean canDrain(EnumFacing from, Fluid fluid) - { - return false; - } - - @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) - { - if(Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(resource.getFluid())) - { - return fluidTank.fill(resource, doFill); - } - - return 0; - } - - @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { return null; } @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) + public IFluidTankProperties[] getTankProperties() { - return new FluidTankInfo[] {fluidTank.getInfo()}; + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank)}; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 161fe62bd..bf9dfda89 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.Tier.FluidTankTier; @@ -39,9 +40,11 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager, ISecurityTile @@ -167,10 +170,11 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { TileEntity tileEntity = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj); - if(tileEntity instanceof IFluidHandler) + if(tileEntity != null && CapabilityUtils.hasCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP)) { + IFluidHandler handler = CapabilityUtils.getCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP); FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(tier.output, fluidTank.getFluidAmount())); - fluidTank.drain(((IFluidHandler)tileEntity).fill(EnumFacing.UP, toDrain, true), true); + fluidTank.drain(handler.fill(toDrain, true), true); } } } @@ -231,11 +235,11 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if(up.getTileEntity(worldObj) instanceof TileEntityFluidTank) { - IFluidHandler handler = (IFluidHandler)up.getTileEntity(worldObj); + IFluidHandler handler = CapabilityUtils.getCapability(up.getTileEntity(worldObj), CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP); - if(handler.canFill(EnumFacing.DOWN, fluid.getFluid())) + if(PipeUtils.canFill(handler, fluid)) { - return handler.fill(EnumFacing.DOWN, fluid, doFill); + return handler.fill(fluid, doFill); } } @@ -470,14 +474,19 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc @Override public boolean hasCapability(Capability capability, EnumFacing side) { - return capability == Capabilities.CONFIGURABLE_CAPABILITY || super.hasCapability(capability, side); + return capability == Capabilities.CONFIGURABLE_CAPABILITY || + capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || + super.hasCapability(capability, side); } + + private EnumFacing capabilitySide = EnumFacing.NORTH; @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.CONFIGURABLE_CAPABILITY) + if(capability == Capabilities.CONFIGURABLE_CAPABILITY || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { + capabilitySide = side; return (T)this; } @@ -485,9 +494,9 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public int fill(EnumFacing from, FluidStack resource, boolean doFill) + public int fill(FluidStack resource, boolean doFill) { - if(resource != null && canFill(from, resource.getFluid())) + if(resource != null && canFillInternal()) { int filled = fluidTank.fill(resource, doFill); @@ -496,7 +505,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc filled += pushUp(PipeUtils.copy(resource, resource.amount-filled), doFill); } - if(filled > 0 && from == EnumFacing.UP) + if(filled > 0 && capabilitySide == EnumFacing.UP) { if(valve == 0) { @@ -514,31 +523,48 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } @Override - public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) + public FluidStack drain(FluidStack resource, boolean doDrain) { - if(resource != null && canDrain(from, resource.getFluid())) + if(canDrainInternal()) { - return fluidTank.drain(resource.amount, doDrain); + return fluidTank.drain(resource, doDrain); } return null; } @Override - public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) + public FluidStack drain(int maxDrain, boolean doDrain) { - if(canDrain(from, null)) + if(canDrainInternal()) { return fluidTank.drain(maxDrain, doDrain); } return null; } - + @Override - public boolean canFill(EnumFacing from, Fluid fluid) + public IFluidTankProperties[] getTankProperties() { - if(from == EnumFacing.DOWN && worldObj != null && getPos() != null) + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank) { + @Override + public boolean canFill() + { + return canFillInternal(); + } + + @Override + public boolean canDrain() + { + return canDrainInternal(); + } + }}; + } + + private boolean canFillInternal() + { + if(capabilitySide == EnumFacing.DOWN && worldObj != null && getPos() != null) { TileEntity tile = worldObj.getTileEntity(getPos().offset(EnumFacing.DOWN)); @@ -548,29 +574,18 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc } } - return fluidTank.getFluid() == null || fluidTank.getFluid().getFluid() == fluid; + return true; } - @Override - public boolean canDrain(EnumFacing from, Fluid fluid) + private boolean canDrainInternal() { if(fluidTank != null) { - if(fluid == null || fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == fluid) - { - return !(isActive && from == EnumFacing.DOWN); - - } + return !(isActive && capabilitySide == EnumFacing.DOWN); } return false; } - - @Override - public FluidTankInfo[] getTankInfo(EnumFacing from) - { - return new FluidTankInfo[] {fluidTank.getInfo()}; - } @Override public void setFluidStack(FluidStack fluidStack, Object... data) diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 3bfc27625..d5de528bc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -56,7 +56,19 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen public boolean finishedCalc = false; - public FluidTank fluidTank = new FluidTank(10000); + public FluidTank fluidTank = new FluidTank(10000) { + @Override + public boolean canDrain() + { + return false; + } + + @Override + public boolean canFillFluidType(FluidStack fluid) + { + return fluid.getFluid().canBePlacedInWorld(); + } + }; /** How much energy this machine consumes per-tick. */ public double BASE_ENERGY_PER_TICK = usage.fluidicPlenisherUsage; @@ -422,19 +434,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen @Override public IFluidTankProperties[] getTankProperties() { - return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank) { - @Override - public boolean canDrain() - { - return false; - } - - @Override - public boolean canFillFluidType(FluidStack fluid) - { - return fluid.getFluid().canBePlacedInWorld(); - } - }}; + return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(fluidTank)}; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 71ea9e75e..323ad76eb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -43,13 +43,34 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager { - public FluidTank inputFluidTank = new FluidTank(10000); + public FluidTank inputFluidTank = new FluidTank(10000) { + @Override + public boolean canDrain() + { + return false; + } + + @Override + public boolean canFill() + { + SideData data = configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing); + + if(data.hasSlot(0)) + { + return true; + } + + return false; + } + }; + public GasTank inputGasTank = new GasTank(10000); public GasTank outputGasTank = new GasTank(10000); @@ -353,53 +374,29 @@ public class TileEntityPRC extends TileEntityBasicMachine capability, EnumFacing side) { return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY - || super.hasCapability(capability, side); + || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, side); } + + private EnumFacing capabilitySide = EnumFacing.NORTH; @Override public T getCapability(Capability capability, EnumFacing side) { - if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY) + if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY || + capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { + capabilitySide = side; return (T)this; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 58bf76213..e24042b2e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -405,54 +405,66 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public int fill(FluidStack resource, boolean doFill) { + if(!tankProperties.canFill()) + { + return 0; + } + return frequency.storedFluid.fill(resource, doFill); } @Override public FluidStack drain(FluidStack resource, boolean doDrain) { - if(resource.isFluidEqual(frequency.storedFluid.getFluid())) + if(!tankProperties.canDrain()) { - return frequency.storedFluid.drain(resource.amount, doDrain); + return null; } - return null; + return frequency.storedFluid.drain(resource, doDrain); } @Override public FluidStack drain(int maxDrain, boolean doDrain) { + if(!tankProperties.canDrain()) + { + return null; + } + return frequency.storedFluid.drain(maxDrain, doDrain); } + + private IFluidTankProperties tankProperties = new FluidTankPropertiesWrapper(frequency.storedFluid) { + @Override + public boolean canFill() + { + if(configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing).ioState == IOState.INPUT) + { + return true; + } + + return false; + } + + @Override + public boolean canDrain() + { + if(configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing).ioState == IOState.OUTPUT) + { + return true; + } + + return false; + } + }; @Override public IFluidTankProperties[] getTankProperties() { if(configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing).ioState != IOState.OFF) { - return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(frequency.storedFluid) { - @Override - public boolean canFillFluidType(FluidStack fluid) - { - if(configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing).ioState == IOState.INPUT) - { - return frequency.storedFluid.getFluid() == null || fluid.getFluid() == frequency.storedFluid.getFluid().getFluid(); - } - - return false; - } - - @Override - public boolean canDrainFluidType(FluidStack fluid) - { - if(configComponent.getOutput(TransmissionType.FLUID, capabilitySide, facing).ioState == IOState.OUTPUT) - { - return frequency.storedFluid.getFluid() == null || fluid.getFluid() == frequency.storedFluid.getFluid().getFluid(); - } - - return false; - } - }}; + return new IFluidTankProperties[] {tankProperties}; } return PipeUtils.EMPTY; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 2ed6f3e5f..a694e418e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -505,7 +505,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp @Override public FluidStack drain(FluidStack resource, boolean doDrain) { - return drain(resource.amount, doDrain); + return fluidTank.drain(resource, doDrain); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index b77ae9198..b9f14402d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -3,10 +3,10 @@ package mekanism.common.tile; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.common.capabilities.Capabilities; -import mekanism.common.util.PipeUtils; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; @@ -48,14 +48,7 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat @Override public FluidStack drain(FluidStack resource, boolean doDrain) { - TileEntityThermalEvaporationController controller = getController(); - - if(resource == null || resource.isFluidEqual(controller.outputTank.getFluid())) - { - return controller.outputTank.drain(resource.amount, doDrain); - } - - return null; + return getController().outputTank.drain(resource, doDrain); } @Override @@ -69,11 +62,6 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat { TileEntityThermalEvaporationController controller = getController(); - if(controller == null) - { - return PipeUtils.EMPTY; - } - return new IFluidTankProperties[] {new FluidTankPropertiesWrapper(controller.inputTank), new FluidTankPropertiesWrapper(controller.outputTank)}; } @@ -133,7 +121,9 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat @Override public boolean hasCapability(Capability capability, EnumFacing side) { - return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side); + return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || + (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && getController() != null) || + super.hasCapability(capability, side); } @Override @@ -144,6 +134,11 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat return (T)this; } + if(capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY && getController() != null) + { + return (T)this; + } + return super.getCapability(capability, side); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 27a5623c1..659722455 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -334,7 +334,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui @Override public boolean canDrainFluidType(FluidStack fluidStack) { - return false; + return canDrain(); } }}; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 6e960991f..608a45353 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -25,7 +25,6 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -346,12 +345,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override public int fill(FluidStack resource, boolean doFill) { - if(resource.getFluid() == FluidRegistry.LAVA) - { - return lavaTank.fill(resource, doFill); - } - - return 0; + return lavaTank.fill(resource, doFill); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index d5eec448c..d124cc363 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -20,7 +20,6 @@ import mekanism.generators.common.content.turbine.TurbineFluidTank; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; @@ -348,7 +347,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { int filled = fluidTank.fill(resource, doFill); - if(structure != null && doFill) + if(doFill) { structure.newSteamInput += filled; } @@ -359,7 +358,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public FluidStack drain(FluidStack resource, boolean doDrain) { - if(structure != null && structure.fluidStored != null) + if(structure.fluidStored != null) { if(resource.getFluid() == structure.fluidStored.getFluid()) { @@ -373,12 +372,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public FluidStack drain(int maxDrain, boolean doDrain) { - if(structure != null) - { - return fluidTank.drain(maxDrain, doDrain); - } - - return null; + return fluidTank.drain(maxDrain, doDrain); } @Override From ca108a0999cd8b68d377f52d7864fab2c57c4032 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 29 Jun 2016 11:50:50 -0400 Subject: [PATCH 3/3] A few fixes --- .../transmitter/RenderMechanicalPipe.java | 4 +-- src/main/java/mekanism/common/SideData.java | 1 + .../mekanism/common/tile/TileEntityPRC.java | 31 ++++++++++--------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 0ccb0ba07..aa86ce15a 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -86,7 +86,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase