mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Update lots of APIs, most notably BC and an actual 1.7 version of CC
This commit is contained in:
1 parent
e2e3e1017f
commit
4d1c1285b2
108 files changed
+1676
-2403
No files matched your search
@@ -1,10 +1,5 @@
|
||||
package mekanism.common.util;
|
||||
|
||||
import ic2.api.energy.EnergyNet;
|
||||
import ic2.api.energy.tile.IEnergyAcceptor;
|
||||
import ic2.api.energy.tile.IEnergySink;
|
||||
import ic2.api.energy.tile.IEnergySource;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
@@ -17,13 +12,17 @@ import mekanism.api.transmitters.IGridTransmitter;
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.tile.TileEntityElectricBlock;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import buildcraft.api.mj.IBatteryObject;
|
||||
import buildcraft.api.mj.MjAPI;
|
||||
import buildcraft.api.power.IPowerEmitter;
|
||||
|
||||
import cofh.api.energy.IEnergyConnection;
|
||||
import cofh.api.energy.IEnergyHandler;
|
||||
import cofh.api.energy.IEnergyProvider;
|
||||
import cofh.api.energy.IEnergyReceiver;
|
||||
import ic2.api.energy.EnergyNet;
|
||||
import ic2.api.energy.tile.IEnergyAcceptor;
|
||||
import ic2.api.energy.tile.IEnergySink;
|
||||
import ic2.api.energy.tile.IEnergySource;
|
||||
|
||||
public final class CableUtils
|
||||
{
|
||||
@@ -55,8 +54,7 @@ public final class CableUtils
|
||||
{
|
||||
return (tileEntity instanceof IStrictEnergyAcceptor ||
|
||||
(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) ||
|
||||
(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(tileEntity) != null && !(tileEntity instanceof IGridTransmitter)) ||
|
||||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler));
|
||||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -145,9 +143,7 @@ public final class CableUtils
|
||||
{
|
||||
return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) ||
|
||||
(MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) ||
|
||||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler && ((IEnergyHandler)tileEntity).canConnectEnergy(side.getOpposite())) ||
|
||||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite())) ||
|
||||
(MekanismUtils.useBuildCraft() && tileEntity instanceof IPowerEmitter && ((IPowerEmitter)tileEntity).canEmitPowerFrom(side.getOpposite()));
|
||||
(MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -196,16 +192,9 @@ public final class CableUtils
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler)
|
||||
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyConnection)
|
||||
{
|
||||
if(((IEnergyHandler)tileEntity).canConnectEnergy(side.getOpposite()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else if(MekanismUtils.useBuildCraft())
|
||||
{
|
||||
if(MjAPI.getMjBattery(tileEntity, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null)
|
||||
if(((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -298,9 +287,9 @@ public final class CableUtils
|
||||
sent += acceptor.transferEnergyToAcceptor(side.getOpposite(), currentSending);
|
||||
}
|
||||
}
|
||||
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyHandler)
|
||||
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)
|
||||
{
|
||||
IEnergyHandler handler = (IEnergyHandler)tileEntity;
|
||||
IEnergyReceiver handler = (IEnergyReceiver)tileEntity;
|
||||
|
||||
if(handler.canConnectEnergy(side.getOpposite()))
|
||||
{
|
||||
@@ -317,12 +306,6 @@ public final class CableUtils
|
||||
sent += (toSend - (((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*Mekanism.TO_IC2, 0)*Mekanism.FROM_IC2));
|
||||
}
|
||||
}
|
||||
else if(MekanismUtils.useBuildCraft() && MjAPI.getMjBattery(tileEntity, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite()) != null && !tryAgain)
|
||||
{
|
||||
IBatteryObject battery = MjAPI.getMjBattery(tileEntity, MjAPI.DEFAULT_POWER_FRAMEWORK, side.getOpposite());
|
||||
double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*Mekanism.TO_BC));
|
||||
sent += toSend*Mekanism.FROM_BC;
|
||||
}
|
||||
|
||||
return sent;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user