Implement IFluidHandler properly on all blocks.

Should fix all ExtraCells dupe bugs.
This commit is contained in:
Bernhard Bonigl committed 2014-09-08 15:27:34 +02:00
1 parent b13e2b5340
commit 79b0c5ef86
4 files changed
+13 -3

No files matched your search

@@ -263,6 +263,8 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
@Override
public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
{
if(liquid.getFluid() == resource.getFluid())
this.drain(resource.amount, doDrain);
return null;
}
@@ -263,6 +263,8 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
@Override
public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
{
if(liquid.getFluid() == resource.getFluid())
this.drain(resource.amount, doDrain);
return null;
}
@@ -53,7 +53,13 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
@Override
public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
{
return null;
if(tank.getFluidAmount() == 0)
return null;
if(tank.getFluid().getFluid() != resource.getFluid())
return null;
// same fluid, k
return this.drain(from, resource.amount, doDrain);
}
@Override
@@ -60,10 +60,10 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl
@Override
public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain)
{
if (hasValidMaster() && canDrain(from, null))
if (hasValidMaster() && canDrain(from, resource.getFluid()))
{
SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z);
if(resource.getFluid() == smeltery.getFluid()){
if(resource.getFluid() == smeltery.getFluid().getFluid()) {
return smeltery.drain(resource.amount, doDrain);
}
}