Completed Tesla support, using a handy new system of wrapper-abstracted item and tile capability handlers

This commit is contained in:
aidancbrady committed 2016-07-02 01:27:49 -04:00
1 parent 53353cd050
commit 333cc7ff27
25 files changed
+597 -111

No files matched your search

@@ -18,6 +18,7 @@ import mekanism.api.transmitters.TransmissionType;
import mekanism.api.util.CapabilityUtils;
import mekanism.common.base.IEnergyWrapper;
import mekanism.common.capabilities.Capabilities;
import net.darkhax.tesla.api.ITeslaConsumer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -72,13 +73,9 @@ public final class CableUtils
{
return false;
}
if(isConnectable(cableEntity, tile, side))
{
return true;
}
return isOutputter(tile, side) || (MekanismUtils.useRF() && tile instanceof IEnergyConnection && ((IEnergyConnection)tile).canConnectEnergy(side.getOpposite()));
return isAcceptor(cableEntity, tile, side) || isOutputter(tile, side) ||
(MekanismUtils.useRF() && tile instanceof IEnergyConnection && ((IEnergyConnection)tile).canConnectEnergy(side.getOpposite()));
}
/**
@@ -125,6 +122,11 @@ public final class CableUtils
}
}
if(MekanismUtils.useTesla() && CapabilityUtils.hasCapability(tileEntity, Capabilities.TESLA_PRODUCER_CAPABILITY, side.getOpposite()))
{
return true;
}
if(MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()))
{
return true;
@@ -143,7 +145,7 @@ public final class CableUtils
return false;
}
public static boolean isConnectable(TileEntity orig, TileEntity tileEntity, EnumFacing side)
public static boolean isAcceptor(TileEntity orig, TileEntity tileEntity, EnumFacing side)
{
if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))
{
@@ -157,12 +159,9 @@ public final class CableUtils
return true;
}
}
else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()))
else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite()))
{
if(CapabilityUtils.getCapability(tileEntity, Capabilities.CABLE_OUTPUTTER_CAPABILITY, side.getOpposite()).canOutputTo(side.getOpposite()))
{
return true;
}
return true;
}
else if(MekanismUtils.useIC2())
{
@@ -176,9 +175,9 @@ public final class CableUtils
}
}
}
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection)
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)
{
if(((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()))
if(((IEnergyReceiver)tileEntity).canConnectEnergy(side.getOpposite()))
{
return true;
}
@@ -271,6 +270,11 @@ public final class CableUtils
sent += acceptor.transferEnergyToAcceptor(side.getOpposite(), currentSending);
}
}
else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite()))
{
ITeslaConsumer consumer = CapabilityUtils.getCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite());
sent += consumer.givePower((long)Math.round(currentSending*general.TO_TESLA), false);
}
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)
{
IEnergyReceiver handler = (IEnergyReceiver)tileEntity;
@@ -282,13 +286,15 @@ public final class CableUtils
sent += used*general.FROM_RF;
}
}
else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink)
else if(MekanismUtils.useIC2())
{
if(((IEnergySink)tileEntity).acceptsEnergyFrom(from, side.getOpposite()))
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
if(tile instanceof IEnergySink && ((IEnergySink)tile).acceptsEnergyFrom(from, side.getOpposite()))
{
double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink)tileEntity).getSinkTier())*general.FROM_IC2);
toSend = Math.min(Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2), Integer.MAX_VALUE);
sent += (toSend - (((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2));
double toSend = Math.min(currentSending*general.TO_IC2, EnergyNet.instance.getPowerFromTier(((IEnergySink)tile).getSinkTier()));
toSend = Math.min(Math.min(toSend, ((IEnergySink)tile).getDemandedEnergy()), Integer.MAX_VALUE);
sent += (toSend - (((IEnergySink)tile).injectEnergy(side.getOpposite(), toSend, 0)))*general.FROM_IC2;
}
}