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

Fixes to storage

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-05 16:47:03 +02:00
parent f8d1daac23
commit ad012d253b
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/refinedstorage/api/storage/NBTStorage.java
View File

@@ -92,31 +92,31 @@ public abstract class NBTStorage implements IStorage {
@Override @Override
public ItemStack push(ItemStack stack, boolean simulate) { public ItemStack push(ItemStack stack, boolean simulate) {
for (ItemStack s : stacks) { for (ItemStack otherStack : stacks) {
if (RefinedStorageUtils.compareStackNoQuantity(s, stack)) { if (RefinedStorageUtils.compareStackNoQuantity(otherStack, stack)) {
if (!simulate) { if (!simulate) {
markDirty(); markDirty();
} }
if (getStored() + stack.stackSize > getCapacity()) { if (getStored() + stack.stackSize > getCapacity()) {
int overflow = getCapacity() - s.stackSize; int remainingSpace = getCapacity() - getStored();
if (overflow == 0) { if (remainingSpace <= 0) {
return stack; return stack;
} }
if (!simulate) { if (!simulate) {
tag.setInteger(NBT_STORED, getStored() + overflow); tag.setInteger(NBT_STORED, getStored() + remainingSpace);
s.stackSize += overflow; otherStack.stackSize += remainingSpace;
} }
return ItemHandlerHelper.copyStackWithSize(s, stack.stackSize - overflow); return ItemHandlerHelper.copyStackWithSize(otherStack, stack.stackSize - remainingSpace);
} else { } else {
if (!simulate) { if (!simulate) {
tag.setInteger(NBT_STORED, getStored() + stack.stackSize); tag.setInteger(NBT_STORED, getStored() + stack.stackSize);
s.stackSize += stack.stackSize; otherStack.stackSize += stack.stackSize;
} }
return null; return null;
@@ -129,19 +129,19 @@ public abstract class NBTStorage implements IStorage {
} }
if (getStored() + stack.stackSize > getCapacity()) { if (getStored() + stack.stackSize > getCapacity()) {
int overflow = getCapacity() - stack.stackSize; int remainingSpace = getCapacity() - getStored();
if (overflow == 0) { if (remainingSpace <= 0) {
return stack; return stack;
} }
if (!simulate) { if (!simulate) {
tag.setInteger(NBT_STORED, getStored() + overflow); tag.setInteger(NBT_STORED, getStored() + remainingSpace);
stacks.add(ItemHandlerHelper.copyStackWithSize(stack, overflow)); stacks.add(ItemHandlerHelper.copyStackWithSize(stack, remainingSpace));
} }
return ItemHandlerHelper.copyStackWithSize(stack, stack.stackSize - overflow); return ItemHandlerHelper.copyStackWithSize(stack, stack.stackSize - remainingSpace);
} else { } else {
tag.setInteger(NBT_STORED, getStored() + stack.stackSize); tag.setInteger(NBT_STORED, getStored() + stack.stackSize);
@@ -153,23 +153,23 @@ public abstract class NBTStorage implements IStorage {
@Override @Override
public ItemStack take(ItemStack stack, int size, int flags) { public ItemStack take(ItemStack stack, int size, int flags) {
for (ItemStack s : stacks) { for (ItemStack otherStack : stacks) {
if (RefinedStorageUtils.compareStack(s, stack, flags)) { if (RefinedStorageUtils.compareStack(otherStack, stack, flags)) {
if (size > s.stackSize) { if (size > otherStack.stackSize) {
size = s.stackSize; size = otherStack.stackSize;
} }
if (s.stackSize - size == 0) { if (otherStack.stackSize - size == 0) {
stacks.remove(s); stacks.remove(otherStack);
} else { } else {
s.stackSize -= size; otherStack.stackSize -= size;
} }
tag.setInteger(NBT_STORED, getStored() - size); tag.setInteger(NBT_STORED, getStored() - size);
markDirty(); markDirty();
return ItemHandlerHelper.copyStackWithSize(s, size); return ItemHandlerHelper.copyStackWithSize(otherStack, size);
} }
} }

2
src/main/java/refinedstorage/tile/TileExternalStorage.java
View File

@@ -86,7 +86,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
} }
} }
return null; return stack;
} }
@Override @Override