mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Update BC API and fix up EnergyNet and CableUtils to work with the new MjAPI
This commit is contained in:
1 parent
d8321196d9
commit
d7c060d6fb
28 files changed
+231
-902
No files matched your search
@@ -1,5 +1,7 @@
|
||||
package mekanism.common.util;
|
||||
|
||||
import buildcraft.api.mj.IBatteryObject;
|
||||
import buildcraft.api.mj.MjAPI;
|
||||
import ic2.api.energy.EnergyNet;
|
||||
import ic2.api.energy.tile.IEnergyAcceptor;
|
||||
import ic2.api.energy.tile.IEnergySink;
|
||||
@@ -20,9 +22,6 @@ import mekanism.common.tile.TileEntityElectricBlock;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
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;
|
||||
|
||||
public final class CableUtils
|
||||
@@ -61,7 +60,7 @@ public final class CableUtils
|
||||
{
|
||||
return (tileEntity instanceof IStrictEnergyAcceptor ||
|
||||
(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) ||
|
||||
(MekanismUtils.useBuildCraft() && tileEntity instanceof IPowerReceptor && !(tileEntity instanceof IGridTransmitter)) ||
|
||||
(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(tileEntity) != null && !(tileEntity instanceof IGridTransmitter)) ||
|
||||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler));
|
||||
}
|
||||
|
||||
@@ -208,9 +207,9 @@ public final class CableUtils
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else if(MekanismUtils.useBuildCraft() && tileEntity instanceof IPowerReceptor)
|
||||
else if(MekanismUtils.useBuildCraft())
|
||||
{
|
||||
if(((IPowerReceptor)tileEntity).getPowerReceiver(side.getOpposite()) != null)
|
||||
if(MjAPI.getMjBattery(tileEntity, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -325,14 +324,14 @@ public final class CableUtils
|
||||
sent += (toSend - rejects);
|
||||
}
|
||||
}
|
||||
else if(MekanismUtils.useBuildCraft() && tileEntity instanceof IPowerReceptor)
|
||||
else if(MekanismUtils.useBuildCraft())
|
||||
{
|
||||
PowerReceiver receiver = ((IPowerReceptor)tileEntity).getPowerReceiver(side.getOpposite());
|
||||
IBatteryObject battery = MjAPI.getMjBattery(tileEntity, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite());
|
||||
|
||||
if(receiver != null)
|
||||
if(battery != null)
|
||||
{
|
||||
double transferEnergy = Math.min(sendingEnergy, receiver.powerRequest()*Mekanism.FROM_BC);
|
||||
double used = receiver.receiveEnergy(Type.STORAGE, (float)(transferEnergy*Mekanism.TO_BC), side.getOpposite());
|
||||
double transferEnergy = Math.min(sendingEnergy, battery.getEnergyRequested()*Mekanism.FROM_BC);
|
||||
double used = battery.addEnergy(transferEnergy*Mekanism.TO_BC);
|
||||
sent += used*Mekanism.FROM_BC;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user