Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

marking item viewer derpy

Browse source
This commit is contained in:
Ellpeck 2016-11-26 18:15:29 +01:00
parent 550f072b5a
commit a910989501
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemViewer.java
View file

@ -46,7 +46,11 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
if(TileEntityItemViewer.this.canInsertItem(slot, stack, direction)){ if(TileEntityItemViewer.this.canInsertItem(slot, stack, direction)){
SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot); SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot);
if(info != null){ if(info != null){
return info.handler.insertItem(info.switchedIndex, stack, simulate); ItemStack inserted = info.handler.insertItem(info.switchedIndex, stack, simulate);
if(!ItemStack.areItemStacksEqual(inserted, stack)){
TileEntityItemViewer.this.markDirty();
}
return inserted;
} }
} }
return super.insertItem(slot, stack, simulate); return super.insertItem(slot, stack, simulate);
@ -59,7 +63,11 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
if(TileEntityItemViewer.this.canExtractItem(slot, stackIn, direction)){ if(TileEntityItemViewer.this.canExtractItem(slot, stackIn, direction)){
SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot); SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot);
if(info != null){ if(info != null){
return info.handler.extractItem(info.switchedIndex, amount, simulate); ItemStack extracted = info.handler.extractItem(info.switchedIndex, amount, simulate);
if(extracted != null){
TileEntityItemViewer.this.markDirty();
}
return extracted;
} }
} }
} }
@ -95,6 +103,7 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
} }
} }
} }
this.markDirty();
this.oldNetwork = network; this.oldNetwork = network;
this.lastNetworkChangeAmount = network.changeAmount; this.lastNetworkChangeAmount = network.changeAmount;
@ -210,6 +219,7 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
toInsert = StackUtil.addStackSize(toInsert, -StackUtil.getStackSize(inSlot)); toInsert = StackUtil.addStackSize(toInsert, -StackUtil.getStackSize(inSlot));
} }
handler.handler.insertItem(handler.switchedIndex, toInsert, false); handler.handler.insertItem(handler.switchedIndex, toInsert, false);
this.markDirty();
} }
} }
else{ else{
@ -244,7 +254,11 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
public ItemStack decrStackSize(int i, int j){ public ItemStack decrStackSize(int i, int j){
SpecificItemHandlerInfo handler = this.getSwitchedIndexHandler(i); SpecificItemHandlerInfo handler = this.getSwitchedIndexHandler(i);
if(handler != null){ if(handler != null){
return handler.handler.extractItem(handler.switchedIndex, j, false); ItemStack extract = handler.handler.extractItem(handler.switchedIndex, j, false);
if(extract != null){
this.markDirty();
}
return extract;
} }
return null; return null;
} }
@ -255,9 +269,12 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
if(handler != null){ if(handler != null){
ItemStack stackInSlot = handler.handler.getStackInSlot(handler.switchedIndex); ItemStack stackInSlot = handler.handler.getStackInSlot(handler.switchedIndex);
if(StackUtil.isValid(stackInSlot)){ if(StackUtil.isValid(stackInSlot)){
handler.handler.extractItem(handler.switchedIndex, StackUtil.getStackSize(stackInSlot), false); ItemStack extracted = handler.handler.extractItem(handler.switchedIndex, StackUtil.getStackSize(stackInSlot), false);
if(extracted != null){
this.markDirty();
}
return extracted;
} }
return stackInSlot;
} }
return null; return null;
} }