mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-18 19:29:19 +00:00
Universal Cables can now draw energy from laser amplifiers
This commit is contained in:
1 parent
6ce51b0b8d
commit
f350055fab
2 files changed
+13
-7
No files matched your search
@@ -46,8 +46,6 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
|
||||
public double cacheEnergy = 0;
|
||||
public double lastWrite = 0;
|
||||
|
||||
public double drawAmount = 100;
|
||||
|
||||
public PartUniversalCable(Tier.CableTier cableTier)
|
||||
{
|
||||
tier = cableTier;
|
||||
@@ -87,6 +85,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
|
||||
if(!sides.isEmpty())
|
||||
{
|
||||
TileEntity[] connectedOutputters = CableUtils.getConnectedOutputters(tile());
|
||||
double canDraw = tier.cableCapacity/10F;
|
||||
|
||||
for(ForgeDirection side : sides)
|
||||
{
|
||||
@@ -98,7 +97,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
|
||||
{
|
||||
if(((ICableOutputter)outputter).canOutputTo(side.getOpposite()))
|
||||
{
|
||||
double received = Math.min(((IStrictEnergyStorage)outputter).getEnergy(), drawAmount);
|
||||
double received = Math.min(((IStrictEnergyStorage)outputter).getEnergy(), canDraw);
|
||||
double toDraw = received;
|
||||
|
||||
if(received > 0)
|
||||
@@ -111,7 +110,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
|
||||
}
|
||||
else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider)
|
||||
{
|
||||
double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)drawAmount, true) * general.FROM_TE;
|
||||
double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(canDraw*general.TO_TE), true) * general.FROM_TE;
|
||||
double toDraw = received;
|
||||
|
||||
if(received > 0)
|
||||
@@ -119,11 +118,11 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
|
||||
toDraw -= getTransmitterNetwork().emit(received, true);
|
||||
}
|
||||
|
||||
((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)toDraw, false);
|
||||
((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(toDraw*general.TO_TE), false);
|
||||
}
|
||||
else if(MekanismUtils.useIC2() && outputter instanceof IEnergySource)
|
||||
{
|
||||
double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * general.FROM_IC2, drawAmount);
|
||||
double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * general.FROM_IC2, canDraw);
|
||||
double toDraw = received;
|
||||
|
||||
if(received > 0)
|
||||
|
||||
@@ -6,6 +6,7 @@ import java.util.ArrayList;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.api.energy.ICableOutputter;
|
||||
import mekanism.api.lasers.ILaserReceptor;
|
||||
import mekanism.common.LaserManager;
|
||||
import mekanism.common.Mekanism;
|
||||
@@ -19,7 +20,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl
|
||||
public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter
|
||||
{
|
||||
public static final double MAX_ENERGY = 5E9;
|
||||
public double collectedEnergy = 0;
|
||||
@@ -264,4 +265,10 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canOutputTo(ForgeDirection side)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user