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

Switch these around to make the ESD automatically assign to things like chests again

Browse source 
Closes #471
This commit is contained in:
Ellpeck 2016-12-08 21:30:32 +01:00
parent 33d1de7d16
commit 855a86a8f6
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java
View file

@ -145,17 +145,15 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
this.placeToPull = this.worldObj.getTileEntity(this.pos.offset(side)); this.placeToPull = this.worldObj.getTileEntity(this.pos.offset(side));
if(this.slotToPullEnd <= 0 && this.placeToPull != null){ if(this.slotToPullEnd <= 0 && this.placeToPull != null){
if(this.placeToPull instanceof IInventory){ if(this.placeToPull.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)){
this.slotToPullEnd = ((IInventory)this.placeToPull).getSizeInventory(); IItemHandler cap = this.placeToPull.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
} if(cap != null){
else{ this.slotToPullEnd = cap.getSlots();
if(this.placeToPull.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)){
IItemHandler cap = this.placeToPull.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
if(cap != null){
this.slotToPullEnd = cap.getSlots();
}
} }
} }
else if(this.placeToPull instanceof IInventory){
this.slotToPullEnd = ((IInventory)this.placeToPull).getSizeInventory();
}
} }
} }
@ -164,17 +162,15 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
this.placeToPut = this.worldObj.getTileEntity(this.pos.offset(side)); this.placeToPut = this.worldObj.getTileEntity(this.pos.offset(side));
if(this.slotToPutEnd <= 0 && this.placeToPut != null){ if(this.slotToPutEnd <= 0 && this.placeToPut != null){
if(this.placeToPut instanceof IInventory){ if(this.placeToPut.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)){
this.slotToPutEnd = ((IInventory)this.placeToPut).getSizeInventory(); IItemHandler cap = this.placeToPut.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
} if(cap != null){
else{ this.slotToPutEnd = cap.getSlots();
if(this.placeToPut.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)){
IItemHandler cap = this.placeToPut.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
if(cap != null){
this.slotToPutEnd = cap.getSlots();
}
} }
} }
else if(this.placeToPut instanceof IInventory){
this.slotToPutEnd = ((IInventory)this.placeToPut).getSizeInventory();
}
} }
} }
} }