mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-30 00:57:55 +00:00
Code Issues Releases Wiki Activity

Fixed off by one error. Commented not very nice inventory code.

Browse Source
This commit is contained in:
David Queneau
2021-01-31 20:13:59 -08:00
parent f6a26f75c3
commit 83e70377f7
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/dan200/computercraft/shared/peripheral/generic/methods/InventoryMethods.java
View File

@@ -227,33 +227,39 @@ public class InventoryMethods implements GenericSource
*/ */
private static int moveItem( Inventory from, int fromSlot, Inventory to, int toSlot, final int limit ) private static int moveItem( Inventory from, int fromSlot, Inventory to, int toSlot, final int limit )
{ {
/* ORIGINAL FORGE CODE
// See how much we can get out of this slot // See how much we can get out of this slot
// ItemStack extracted = from.extractItem( fromSlot, limit, true ); // ItemStack extracted = from.extractItem( fromSlot, limit, true );
// if( extracted.isEmpty() ) return 0; if( extracted.isEmpty() ) return 0;
// Limit the amount to extract // Limit the amount to extract
// int extractCount = Math.min( extracted.getCount(), limit ); int extractCount = Math.min( extracted.getCount(), limit );
// extracted.setCount( extractCount ); extracted.setCount( extractCount );
// ItemStack remainder = toSlot < 0 ? ItemHandlerHelper.insertItem( to, extracted, false ) : to.insertItem( toSlot, extracted, false ); // ItemStack remainder = toSlot < 0 ? bItemHandlerHelper.insertItem( to, extracted, false ) : to.insertItem( toSlot, extracted, false );
// int inserted = remainder.isEmpty() ? extractCount : extractCount - remainder.getCount(); int inserted = remainder.isEmpty() ? extractCount : extractCount - remainder.getCount();
// if( inserted <= 0 ) return 0; if( inserted <= 0 ) return 0;
// Remove the item from the original inventory. Technically this could fail, but there's little we can do // Remove the item from the original inventory. Technically this could fail, but there's little we can do
// about that. // about that.
//from.extractItem( fromSlot, inserted, false ); from.extractItem( fromSlot, inserted, false );
*/
// Vanilla minecraft inventory manipulation code
Boolean recurse = false; Boolean recurse = false;
ItemStack source = from.getStack( fromSlot ); ItemStack source = from.getStack( fromSlot );
int count = 0; int count = 0;
if (toSlot > 0) { // If target slot was selected, only push items to that slot.
if (toSlot >= 0) {
int space = amountStackCanAddFrom(to.getStack(toSlot), source, to); int space = amountStackCanAddFrom(to.getStack(toSlot), source, to);
if (space == 0) return 0; if (space == 0) return 0;
count = space; count = space;
} }
if (toSlot < 0) { // If target slot not selected, push items where they will fit, possibly
// across slots (by recurring on this method).
else if (toSlot < 0) {
recurse = true; recurse = true;
int[] result = getFirstValidSlotAndSpace(source, to); int[] result = getFirstValidSlotAndSpace(source, to);
toSlot = result[0]; toSlot = result[0];
@@ -261,10 +267,12 @@ public class InventoryMethods implements GenericSource
count = result[1]; count = result[1];
} }
// Compare count available in target ItemStack to limit specified.
count = Math.min(count, limit); count = Math.min(count, limit);
if (count == 0) return 0; if (count == 0) return 0;
ItemStack destination = to.getStack(toSlot);
// Mutate destination and source ItemStack
ItemStack destination = to.getStack(toSlot);
if (destination == ItemStack.EMPTY) { if (destination == ItemStack.EMPTY) {
ItemStack newStack = source.copy(); ItemStack newStack = source.copy();
newStack.setCount(count); newStack.setCount(count);
@@ -278,10 +286,13 @@ public class InventoryMethods implements GenericSource
to.markDirty(); to.markDirty();
from.markDirty(); from.markDirty();
// Recurse if no explicit destination slot and more items exist in source slot
// and limit hasn't been reached. Else, return items moved.
if (recurse && !source.isEmpty()) return count + moveItem(from, fromSlot, to, -1, limit - count); if (recurse && !source.isEmpty()) return count + moveItem(from, fromSlot, to, -1, limit - count);
return count; return count;
} }
// Maybe there is a nicer existing way to do this in the minecraft codebase. I couldn't find it.
private static int[] getFirstValidSlotAndSpace(ItemStack fromStack, Inventory inventory) { private static int[] getFirstValidSlotAndSpace(ItemStack fromStack, Inventory inventory) {
for (int i = 0; i < inventory.size(); i++) { for (int i = 0; i < inventory.size(); i++) {
ItemStack stack = inventory.getStack(i); ItemStack stack = inventory.getStack(i);