Get capabilities off the ground

This commit is contained in:
Ben Spiers committed 2016-05-04 12:45:12 +01:00
1 parent 1d389d9219
commit 384cf174bb
39 files changed
+776 -245

No files matched your search

@@ -10,13 +10,12 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.EnumSet;
import mekanism.api.Capabilities;
import mekanism.common.capabilities.Capabilities;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.IConfigurable;
import mekanism.api.MekanismConfig.general;
import mekanism.api.Range4D;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.common.Mekanism;
import mekanism.common.base.IActiveState;
import mekanism.common.base.IEnergyWrapper;
@@ -387,7 +386,8 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
@Method(modid = "IC2")
public double injectEnergy(EnumFacing direction, double amount, double voltage)
{
if(Coord4D.get(this).offset(direction).getTileEntity(worldObj) instanceof ITransmitterTile)
TileEntity tile = getWorld().getTileEntity(getPos().offset(direction));
if(tile == null || tile.hasCapability(Capabilities.GRID_TRANSMITTER_CAPABILITY, direction.getOpposite()))
{
return amount;
}
@@ -469,17 +469,21 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement
}
@Override
public boolean hasCapability(net.minecraftforge.common.capabilities.Capability<?> capability, net.minecraft.util.EnumFacing facing)
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
{
return capability == Capabilities.ENERGY_STORAGE_CAPABILITY || super.hasCapability(capability, facing);
return capability == Capabilities.ENERGY_STORAGE_CAPABILITY
|| capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY
|| capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY
|| super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, net.minecraft.util.EnumFacing facing)
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
{
if (capability == Capabilities.ENERGY_STORAGE_CAPABILITY)
if(capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY)
return (T) this;
if(capability == Capabilities.CABLE_OUTPUTTER_CAPABILITY)
return (T) this;
return super.getCapability(capability, facing);
}
}