Update BC API and fix up EnergyNet and CableUtils to work with the new MjAPI

This commit is contained in:
Ben Spiers committed 2014-07-31 18:41:32 +01:00
1 parent d8321196d9
commit d7c060d6fb
28 files changed
+231 -902

No files matched your search

@@ -1,5 +1,7 @@
package mekanism.common;
import buildcraft.api.mj.IBatteryObject;
import buildcraft.api.mj.MjAPI;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.tile.IEnergySink;
@@ -22,10 +24,6 @@ import mekanism.common.util.MekanismUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.power.IPowerEmitter;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.power.PowerHandler.Type;
import cofh.api.energy.IEnergyHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.Event;
@@ -145,10 +143,10 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
boolean tryAgain = false;
do {
tryAgain = false;
double prev = sent;
sent += doEmit(energyToSend-sent);
sent += doEmit(energyToSend-sent, tryAgain);
tryAgain = false;
if(energyToSend-sent > 0 && sent-prev > 0)
{
@@ -170,7 +168,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
/**
* @return sent
*/
public synchronized double doEmit(double energyToSend)
public synchronized double doEmit(double energyToSend, boolean retrying)
{
double sent = 0;
@@ -220,13 +218,13 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
sent += used;
if(used > 0) continue;
}
if(MekanismUtils.useBuildCraft() && acceptor instanceof IPowerReceptor)
if(MekanismUtils.useBuildCraft() && !retrying)
{
PowerReceiver receiver = ((IPowerReceptor)acceptor).getPowerReceiver(side.getOpposite());
IBatteryObject battery = MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite());
if(receiver != null)
if(battery != null)
{
double toSend = receiver.receiveEnergy(Type.PIPE, (float)(Math.min(receiver.powerRequest(), currentSending*Mekanism.TO_BC)), side.getOpposite());
double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*Mekanism.TO_BC));
sent += toSend*Mekanism.FROM_BC;
if(toSend > 0) continue;
}
@@ -276,7 +274,7 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
if(handler.canConnectEnergy(side.getOpposite()))
{
if(handler.getMaxEnergyStored(side.getOpposite()) - handler.getEnergyStored(side.getOpposite()) > 0 || handler.receiveEnergy(side.getOpposite(), 1, true) > 0)
if(handler.receiveEnergy(side.getOpposite(), 1, true) > 0)
{
toReturn.add(acceptor);
continue;
@@ -299,22 +297,14 @@ public class EnergyNetwork extends DynamicNetwork<TileEntity, EnergyNetwork>
}
}
}
if(MekanismUtils.useBuildCraft() && acceptor instanceof IPowerReceptor)
if(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null)
{
IPowerReceptor handler = (IPowerReceptor)acceptor;
IBatteryObject battery = MjAPI.getMjBattery(acceptor, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite());
if(handler.getPowerReceiver(side.getOpposite()) != null)
if(battery.getEnergyRequested() > 0)
{
if((handler.getPowerReceiver(side.getOpposite()).powerRequest()*Mekanism.FROM_BC) > 0)
{
if(handler instanceof IPowerEmitter && ((IPowerEmitter)handler).canEmitPowerFrom(side.getOpposite()))
{
continue;
}
toReturn.add(acceptor);
continue;
}
toReturn.add(acceptor);
continue;
}
}
}