Update to latest Forge, use Capability standards. Need to port to new fluid system

This commit is contained in:
aidancbrady committed 2016-06-23 16:34:27 -04:00
1 parent 07e307d9b5
commit e6da7fdc9c
106 files changed
+1101 -196

No files matched your search

@@ -15,7 +15,7 @@ import mekanism.common.base.ITileComponent;
import mekanism.common.base.ITileNetwork;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.capabilities.BaseCapabilities;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.frequency.Frequency;
import mekanism.common.frequency.FrequencyManager;
import mekanism.common.frequency.IFrequencyHandler;
@@ -215,13 +215,13 @@ public abstract class TileEntityBasicBlock extends TileEntity implements ITileNe
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
{
return capability == BaseCapabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing);
return capability == Capabilities.TILE_NETWORK_CAPABILITY || super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
{
if(capability == BaseCapabilities.TILE_NETWORK_CAPABILITY)
if(capability == Capabilities.TILE_NETWORK_CAPABILITY)
return (T)this;
return super.getCapability(capability, facing);
}