Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed generic pipe filling

Browse source
This commit is contained in:
Rseifert 2013-04-17 15:12:44 -04:00
parent 35d8812742
commit 13c2f1fb6c
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/minecraft/fluidmech/common/machines/pipes/TileEntityGenericPipe.java
View file

@ -1,5 +1,7 @@
package fluidmech.common.machines.pipes;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import hydraulic.api.ColorCode;
import hydraulic.helpers.FluidHelper;
import net.minecraft.tileentity.TileEntity;
@ -17,7 +19,8 @@ public class TileEntityGenericPipe extends TileEntityPipe
{
return 0;
}
return this.getNetwork().addFluidToNetwork(worldObj.getBlockTileEntity(xCoord + from.offsetX, yCoord + from.offsetY, zCoord + from.offsetZ), resource, doFill);
TileEntity tile = VectorHelper.getTileEntityFromSide(this.worldObj, new Vector3(this), from);
return this.getNetwork().addFluidToNetwork(tile, resource, doFill);
}
@Override
@ -36,23 +39,24 @@ public class TileEntityGenericPipe extends TileEntityPipe
return this.fakeTank;
}
@Override
public boolean canPipeConnect(TileEntity entity, ForgeDirection dir)
{
return this.subEntities[dir.ordinal()] == null && entity.getClass().equals(this.getClass());
}
@Override
public int getTankSize()
{
return LiquidContainerRegistry.BUCKET_VOLUME;
}
@Override
public int getMaxFlowRate(LiquidStack stack, ForgeDirection side)
{
return FluidHelper.getDefaultFlowRate(stack);
}
@Override
public ColorCode getColor()
{

6
src/minecraft/hydraulic/api/ColorCode.java
View file

@ -55,10 +55,14 @@ public enum ColorCode
*/
public boolean isValidLiquid(LiquidStack stack)
{
if (stack == null || !FluidRestrictionHandler.hasRestrictedStack(this.ordinal()))
if (stack == null)
{
return false;
}
if(!FluidRestrictionHandler.hasRestrictedStack(this.ordinal()))
{
return true;
}
return FluidRestrictionHandler.hasRestrictedStack(this.ordinal()) && FluidRestrictionHandler.getStackForColor(this).isLiquidEqual(stack);
}
}