fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #3793: Limit filling fluid inventories to their max capacity. (#3794)

Browse Source
This commit is contained in:
yueh
2018-10-21 11:18:02 +02:00
committed by GitHub
parent 99fd5a9d53
commit 6291a545c3
1 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fluids/util/AEFluidInventory.java
+25 -36
View File
@@ -17,10 +17,10 @@ public class AEFluidInventory implements IAEFluidTank
{ {
private final IAEFluidStack[] fluids; private final IAEFluidStack[] fluids;
private final IAEFluidInventory handler; private final IAEFluidInventory handler;
private final long capacity; private final int capacity;
private IFluidTankProperties[] props = null; private IFluidTankProperties[] props = null;
public AEFluidInventory( final IAEFluidInventory handler, final int slots, final long capcity ) public AEFluidInventory( final IAEFluidInventory handler, final int slots, final int capcity )
{ {
this.fluids = new IAEFluidStack[slots]; this.fluids = new IAEFluidStack[slots];
this.handler = handler; this.handler = handler;
@@ -29,7 +29,7 @@ public class AEFluidInventory implements IAEFluidTank
public AEFluidInventory( final IAEFluidInventory handler, final int slots ) public AEFluidInventory( final IAEFluidInventory handler, final int slots )
{ {
this( handler, slots, Long.MAX_VALUE ); this( handler, slots, Integer.MAX_VALUE );
} }
@Override @Override
@@ -110,45 +110,34 @@ public class AEFluidInventory implements IAEFluidTank
final IAEFluidStack fluid = this.fluids[slot]; final IAEFluidStack fluid = this.fluids[slot];
if( !doFill ) if( fluid != null && !fluid.equals( resource ) )
{
if( fluid == null )
{
return resource.amount;
}
if( !fluid.equals( resource ) )
{
return 0;
}
return (int) Math.min( Math.min( this.capacity - fluid.getStackSize(), resource.amount ), Integer.MAX_VALUE );
}
if( fluid == null )
{
this.setFluidInSlot( slot, AEFluidStack.fromFluidStack( resource ) );
return resource.amount;
}
if( !fluid.equals( resource ) )
{ {
return 0; return 0;
} }
long filled = this.capacity - fluid.getStackSize();
if( resource.amount < filled ) int amountToStore = this.capacity;
if( fluid != null )
{ {
fluid.setStackSize( fluid.getStackSize() + resource.amount ); amountToStore -= fluid.getStackSize();
filled = resource.amount;
}
else
{
fluid.setStackSize( this.capacity );
} }
this.onContentChanged( slot ); amountToStore = Math.min( amountToStore, resource.amount );
return (int) filled;
if( doFill )
{
if( fluid == null )
{
this.setFluidInSlot( slot, AEFluidStack.fromFluidStack( resource ) );
}
else
{
fluid.setStackSize( fluid.getStackSize() + amountToStore );
this.onContentChanged( slot );
}
}
return amountToStore;
} }
public FluidStack drain( final int slot, final FluidStack resource, final boolean doDrain ) public FluidStack drain( final int slot, final FluidStack resource, final boolean doDrain )
@@ -363,7 +352,7 @@ public class AEFluidInventory implements IAEFluidTank
@Override @Override
public int getCapacity() public int getCapacity()
{ {
return (int) Math.min( AEFluidInventory.this.capacity, Integer.MAX_VALUE ); return Math.min( AEFluidInventory.this.capacity, Integer.MAX_VALUE );
} }
@Override @Override