Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-06 00:49:09 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the Item Distributor being totally broken :^)

Browse source
This commit is contained in:
Ellpeck 2016-12-08 21:15:59 +01:00
parent 79fce5c879
commit 33d1de7d16
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDistributorItem.java
View file

@ -42,7 +42,7 @@ public class TileEntityDistributorItem extends TileEntityInventoryBase{
for(int i = 0; i < handlerUp.getSlots(); i++){ for(int i = 0; i < handlerUp.getSlots(); i++){
ItemStack pullable = handlerUp.extractItem(i, 1, true); ItemStack pullable = handlerUp.extractItem(i, 1, true);
if(StackUtil.isValid(pullable) && (!StackUtil.isValid(this.slots[0]) || ItemUtil.canBeStacked(this.slots[0], pullable))){ if(StackUtil.isValid(pullable) && (!StackUtil.isValid(this.slots[0]) || (ItemUtil.canBeStacked(this.slots[0], pullable) && StackUtil.getStackSize(this.slots[0]) < this.slots[0].getMaxStackSize()))){
ItemStack pulled = handlerUp.extractItem(i, 1, false); ItemStack pulled = handlerUp.extractItem(i, 1, false);
if(StackUtil.isValid(pulled)){ if(StackUtil.isValid(pulled)){
if(!StackUtil.isValid(this.slots[0])){ if(!StackUtil.isValid(this.slots[0])){
@ -86,24 +86,14 @@ public class TileEntityDistributorItem extends TileEntityInventoryBase{
toInsert = StackUtil.setStackSize(toInsert, amount); toInsert = StackUtil.setStackSize(toInsert, amount);
for(int i = 0; i < handler.getSlots(); i++){ for(int i = 0; i < handler.getSlots(); i++){
ItemStack notInserted = handler.insertItem(i, toInsert.copy(), false); toInsert = handler.insertItem(i, toInsert.copy(), false);
if(!StackUtil.isValid(notInserted)){
this.slots[0] = StackUtil.addStackSize(this.slots[0], -amount);
if(!StackUtil.isValid(toInsert)){
this.slots[0] = StackUtil.addStackSize(this.slots[0], -amount);
shouldMarkDirty = true; shouldMarkDirty = true;
break; break;
} }
else if(StackUtil.getStackSize(notInserted) != StackUtil.getStackSize(this.slots[0])){
this.slots[0] = StackUtil.addStackSize(this.slots[0], -StackUtil.getStackSize(notInserted));
toInsert = notInserted;
shouldMarkDirty = true;
}
}
if(!StackUtil.isValid(this.slots[0])){
this.slots[0] = StackUtil.getNull();
shouldMarkDirty = true;
} }
} }
} }