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

Made hasCapability not call getCapability.

Browse source 
Supposedly closes #97
This commit is contained in:
Ellpeck 2016-05-29 23:39:50 +02:00
parent af67fb87cc
commit 79660f3f6f
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInventoryBase.java
View file

@ -223,13 +223,13 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements
@Override @Override
public boolean hasCapability(@Nonnull Capability<?> capability, @Nonnull EnumFacing facing){ public boolean hasCapability(@Nonnull Capability<?> capability, @Nonnull EnumFacing facing){
return this.getCapability(capability, facing) != null; return this.canHandleCapability(capability) || super.hasCapability(capability, facing);
} }
@Nonnull @Nonnull
@Override @Override
public <T> T getCapability(@Nonnull Capability<T> capability, @Nonnull EnumFacing facing){ public <T> T getCapability(@Nonnull Capability<T> capability, @Nonnull EnumFacing facing){
if(this.hasInvWrapperCapabilities() && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){ if(this.canHandleCapability(capability)){
return (T)this.invWrappers[facing.ordinal()]; return (T)this.invWrappers[facing.ordinal()];
} }
else{ else{
@ -237,6 +237,10 @@ public abstract class TileEntityInventoryBase extends TileEntityBase implements
} }
} }
private boolean canHandleCapability(Capability capability){
return this.hasInvWrapperCapabilities() && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY;
}
public boolean hasInvWrapperCapabilities(){ public boolean hasInvWrapperCapabilities(){
return true; return true;
} }

5
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java
View file

@ -122,6 +122,11 @@ public class TileEntityPhantomItemface extends TileEntityPhantomface{
return this.isBoundThingInRange() && (this.getSided() == null || this.getSided().canExtractItem(slot, stack, side)); return this.isBoundThingInRange() && (this.getSided() == null || this.getSided().canExtractItem(slot, stack, side));
} }
@Override
public boolean hasCapability(@Nonnull Capability<?> capability, @Nonnull EnumFacing facing){
return this.isBoundThingInRange() ? this.worldObj.getTileEntity(this.boundPosition).hasCapability(capability, facing) : super.hasCapability(capability, facing);
}
@Nonnull @Nonnull
@Override @Override
public <T> T getCapability(@Nonnull Capability<T> capability, @Nonnull EnumFacing facing){ public <T> T getCapability(@Nonnull Capability<T> capability, @Nonnull EnumFacing facing){