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

Supposedly fix a bug with item interfaces ignoring whitelisting

Browse source
This commit is contained in:
Ellpeck 2016-10-11 14:24:18 +02:00
parent 622cfef3ee
commit d24a09ad67
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,27 +40,31 @@ public class TileEntityItemViewer extends TileEntityInventoryBase{
@Override @Override
protected void getInvWrappers(SidedInvWrapper[] wrappers){ protected void getInvWrappers(SidedInvWrapper[] wrappers){
for(int i = 0; i < wrappers.length; i++){ for(int i = 0; i < wrappers.length; i++){
wrappers[i] = new SidedInvWrapper(this, EnumFacing.values()[i]){ final EnumFacing direction = EnumFacing.values()[i];
wrappers[i] = new SidedInvWrapper(this, direction){
@Override @Override
public ItemStack insertItem(int slot, ItemStack stack, boolean simulate){ public ItemStack insertItem(int slot, ItemStack stack, boolean simulate){
SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot); if(TileEntityItemViewer.this.canInsertItem(slot, stack, direction)){
if(info != null){ SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot);
return info.handler.insertItem(info.switchedIndex, stack, simulate); if(info != null){
} return info.handler.insertItem(info.switchedIndex, stack, simulate);
else{ }
return super.insertItem(slot, stack, simulate);
} }
return super.insertItem(slot, stack, simulate);
} }
@Override @Override
public ItemStack extractItem(int slot, int amount, boolean simulate){ public ItemStack extractItem(int slot, int amount, boolean simulate){
SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot); ItemStack stackIn = TileEntityItemViewer.this.getStackInSlot(slot);
if(info != null){ if(stackIn != null){
return info.handler.extractItem(info.switchedIndex, amount, simulate); if(TileEntityItemViewer.this.canExtractItem(slot, stackIn, direction)){
} SpecificItemHandlerInfo info = TileEntityItemViewer.this.getSwitchedIndexHandler(slot);
else{ if(info != null){
return super.extractItem(slot, amount, simulate); return info.handler.extractItem(info.switchedIndex, amount, simulate);
}
}
} }
return super.extractItem(slot, amount, simulate);
} }
}; };
} }