mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-07-07 04:22:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #582 from SquidDev-CC/ComputerCraft/hotfix/extract-overflow

Browse Source 
Fix InventoryUtil ignoring the stack limit when extracting items
This commit is contained in:
SquidDev 2018-11-27 17:43:42 +00:00
commit afdfcb21b7
1 changed files with 39 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/main/java/dan200/computercraft/shared/util/InventoryUtil.java
View File

@ -95,122 +95,77 @@ public class InventoryUtil
// Methods for placing into inventories: // Methods for placing into inventories:
@Nonnull
public static ItemStack storeItems( @Nonnull ItemStack itemstack, IItemHandler inventory, int start, int range, int begin )
{
int[] slots = makeSlotList( start, range, begin );
return storeItems( itemstack, inventory, slots );
}
@Nonnull @Nonnull
public static ItemStack storeItems( @Nonnull ItemStack itemstack, IItemHandler inventory, int begin ) public static ItemStack storeItems( @Nonnull ItemStack itemstack, IItemHandler inventory, int begin )
{ {
int[] slots = makeSlotList( 0, inventory.getSlots(), begin ); return storeItems( itemstack, inventory, 0, inventory.getSlots(), begin );
return storeItems( itemstack, inventory, slots );
} }
@Nonnull @Nonnull
public static ItemStack storeItems( @Nonnull ItemStack itemstack, IItemHandler inventory ) public static ItemStack storeItems( @Nonnull ItemStack itemstack, IItemHandler inventory )
{ {
int[] slots = makeSlotList( 0, inventory.getSlots(), 0 ); // TODO: optimise this out? return storeItems( itemstack, inventory, 0, inventory.getSlots(), 0 );
return storeItems( itemstack, inventory, slots );
}
// Methods for taking out of inventories
@Nonnull
public static ItemStack takeItems( int count, IItemHandler inventory, int start, int range, int begin )
{
int[] slots = makeSlotList( start, range, begin );
return takeItems( count, inventory, slots );
} }
@Nonnull @Nonnull
public static ItemStack takeItems( int count, IItemHandler inventory, int begin ) public static ItemStack storeItems( @Nonnull ItemStack stack, IItemHandler inventory, int start, int range, int begin )
{ {
int[] slots = makeSlotList( 0, inventory.getSlots(), begin ); if( stack.isEmpty() ) return ItemStack.EMPTY;
return takeItems( count, inventory, slots );
}
@Nonnull
public static ItemStack takeItems( int count, IItemHandler inventory )
{
int[] slots = makeSlotList( 0, inventory.getSlots(), 0 );
return takeItems( count, inventory, slots );
}
// Private methods
private static int[] makeSlotList( int start, int range, int begin )
{
if( start < 0 || range == 0 )
{
return null;
}
int[] slots = new int[ range ];
for( int n = 0; n < slots.length; ++n )
{
slots[ n ] = start + ((n + (begin - start)) % range);
}
return slots;
}
@Nonnull
private static ItemStack storeItems( @Nonnull ItemStack stack, IItemHandler inventory, int[] slots )
{
if( slots == null || slots.length == 0 )
{
return stack;
}
if( stack.isEmpty() )
{
return ItemStack.EMPTY;
}
// Inspect the slots in order and try to find empty or stackable slots // Inspect the slots in order and try to find empty or stackable slots
ItemStack remainder = stack.copy(); ItemStack remainder = stack.copy();
for( int slot : slots ) for( int i = 0; i < range; i++ )
{ {
int slot = start + ((i + (begin - start)) % range);
if( remainder.isEmpty() ) break; if( remainder.isEmpty() ) break;
remainder = inventory.insertItem( slot, remainder, false ); remainder = inventory.insertItem( slot, remainder, false );
} }
return areItemsEqual( stack, remainder ) ? stack : remainder; return areItemsEqual( stack, remainder ) ? stack : remainder;
} }
// Methods for taking out of inventories
@Nonnull @Nonnull
private static ItemStack takeItems( int count, IItemHandler inventory, int[] slots ) public static ItemStack takeItems( int count, IItemHandler inventory, int begin )
{ {
if( slots == null ) return takeItems( count, inventory, 0, inventory.getSlots(), begin );
{
return ItemStack.EMPTY;
} }
@Nonnull
public static ItemStack takeItems( int count, IItemHandler inventory )
{
return takeItems( count, inventory, 0, inventory.getSlots(), 0 );
}
@Nonnull
public static ItemStack takeItems( int count, IItemHandler inventory, int start, int range, int begin )
{
// Combine multiple stacks from inventory into one if necessary // Combine multiple stacks from inventory into one if necessary
ItemStack partialStack = ItemStack.EMPTY; ItemStack partialStack = ItemStack.EMPTY;
int countRemaining = count; for( int i = 0; i < range; i++ )
for( int slot : slots )
{ {
if( countRemaining <= 0 ) break; int slot = start + ((i + (begin - start)) % range);
if( count <= 0 ) break;
ItemStack stack = inventory.getStackInSlot( slot ); ItemStack stack = inventory.getStackInSlot( slot );
if( !stack.isEmpty() ) if( !stack.isEmpty() && (partialStack.isEmpty() || areItemsStackable( stack, partialStack )) )
{ {
if( partialStack.isEmpty() || areItemsStackable( stack, partialStack ) ) ItemStack extracted = inventory.extractItem( slot, count, false );
{
ItemStack extracted = inventory.extractItem( slot, countRemaining, false );
if( !extracted.isEmpty() ) if( !extracted.isEmpty() )
{ {
countRemaining -= extracted.getCount();
if( partialStack.isEmpty() ) if( partialStack.isEmpty() )
{ {
// If we've extracted for this first time, then limit the count to the maximum stack size.
partialStack = extracted; partialStack = extracted;
count = Math.min( count, extracted.getMaxStackSize() );
} }
else else
{ {
partialStack.grow( extracted.getCount() ); partialStack.grow( extracted.getCount() );
} }
}
count -= extracted.getCount();
} }
} }
} }