dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed not being able to insert stack in empty drawer due to API change, #1346

Browse Source
This commit is contained in:
raoulvdberge
2017-07-06 17:01:44 +02:00
parent f686b3c53b
commit 0a375d81a1
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemDrawer.java
View File

@@ -71,6 +71,16 @@ public class StorageItemDrawer extends StorageItemExternal {
public static ItemStack insert(NetworkNodeExternalStorage externalStorage, @Nullable IDrawer drawer, @Nonnull ItemStack stack, int size, boolean simulate) { public static ItemStack insert(NetworkNodeExternalStorage externalStorage, @Nullable IDrawer drawer, @Nonnull ItemStack stack, int size, boolean simulate) {
if (drawer != null && IFilterable.canTake(externalStorage.getItemFilters(), externalStorage.getMode(), externalStorage.getCompare(), stack) && drawer.canItemBeStored(stack)) { if (drawer != null && IFilterable.canTake(externalStorage.getItemFilters(), externalStorage.getMode(), externalStorage.getCompare(), stack) && drawer.canItemBeStored(stack)) {
if (drawer.getStoredItemCount() == 0) {
int toInsert = size > drawer.getMaxCapacity() ? drawer.getMaxCapacity() : size;
if (!simulate) {
drawer.setStoredItem(stack, toInsert);
}
return toInsert == size ? null : ItemHandlerHelper.copyStackWithSize(stack, size - toInsert);
}
int remainder = simulate ? Math.max(size - drawer.getAcceptingRemainingCapacity(), 0) : drawer.adjustStoredItemCount(size); int remainder = simulate ? Math.max(size - drawer.getAcceptingRemainingCapacity(), 0) : drawer.adjustStoredItemCount(size);
return remainder == 0 ? null : ItemHandlerHelper.copyStackWithSize(stack, remainder); return remainder == 0 ? null : ItemHandlerHelper.copyStackWithSize(stack, remainder);