mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Abstract away cable IC2 integration. Hopefully this works
This commit is contained in:
1 parent
fa45e1168c
commit
3992ead0ff
2 files changed
+66
-35
No files matched your search
@@ -0,0 +1,58 @@
|
||||
package mekanism.common.integration;
|
||||
|
||||
import ic2.api.energy.EnergyNet;
|
||||
import ic2.api.energy.tile.IEnergySink;
|
||||
import ic2.api.energy.tile.IEnergySource;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
import mekanism.api.MekanismConfig.general;
|
||||
import mekanism.common.base.IEnergyWrapper;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraftforge.fml.common.Optional.Method;
|
||||
|
||||
public class IC2Integration
|
||||
{
|
||||
@Method(modid = "IC2")
|
||||
public static boolean isOutputter(TileEntity tileEntity, EnumFacing side)
|
||||
{
|
||||
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
|
||||
|
||||
if(tile instanceof IEnergySource && ((IEnergySource)tile).emitsEnergyTo(null, side.getOpposite()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Method(modid = "IC2")
|
||||
public static boolean isAcceptor(TileEntity orig, TileEntity tileEntity, EnumFacing side)
|
||||
{
|
||||
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
|
||||
|
||||
if(tile instanceof IEnergySink)
|
||||
{
|
||||
if(((IEnergySink)tile).acceptsEnergyFrom(null, side.getOpposite()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Method(modid = "IC2")
|
||||
public static double emitEnergy(IEnergyWrapper from, TileEntity tileEntity, EnumFacing side, double currentSending)
|
||||
{
|
||||
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
|
||||
|
||||
if(tile instanceof IEnergySink && ((IEnergySink)tile).acceptsEnergyFrom(from, side.getOpposite()))
|
||||
{
|
||||
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);
|
||||
return (toSend - (((IEnergySink)tile).injectEnergy(side.getOpposite(), toSend, 0)))*general.FROM_IC2;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
package mekanism.common.util;
|
||||
|
||||
import ic2.api.energy.EnergyNet;
|
||||
import ic2.api.energy.tile.IEnergySink;
|
||||
import ic2.api.energy.tile.IEnergyTile;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
@@ -16,6 +12,7 @@ import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.api.util.CapabilityUtils;
|
||||
import mekanism.common.base.IEnergyWrapper;
|
||||
import mekanism.common.capabilities.Capabilities;
|
||||
import mekanism.common.integration.IC2Integration;
|
||||
import net.darkhax.tesla.api.ITeslaConsumer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
@@ -130,15 +127,10 @@ public final class CableUtils
|
||||
return true;
|
||||
}
|
||||
|
||||
/*if(MekanismUtils.useIC2())
|
||||
if(MekanismUtils.useIC2() && IC2Integration.isOutputter(tileEntity, side))
|
||||
{
|
||||
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
|
||||
|
||||
if(tile instanceof IEnergySource && ((IEnergySource)tile).emitsEnergyTo(null, side.getOpposite()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}*/
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -161,18 +153,10 @@ public final class CableUtils
|
||||
{
|
||||
return true;
|
||||
}
|
||||
/*else if(MekanismUtils.useIC2())
|
||||
else if(MekanismUtils.useIC2() && IC2Integration.isAcceptor(orig, tileEntity, side))
|
||||
{
|
||||
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
|
||||
|
||||
if(tile instanceof IEnergySink)
|
||||
{
|
||||
if(((IEnergySink)tile).acceptsEnergyFrom(null, side.getOpposite()))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
return true;
|
||||
}
|
||||
else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver)
|
||||
{
|
||||
if(((IEnergyReceiver)tileEntity).canConnectEnergy(side.getOpposite()))
|
||||
@@ -286,18 +270,7 @@ public final class CableUtils
|
||||
}
|
||||
else if(MekanismUtils.useIC2())
|
||||
{
|
||||
try {
|
||||
IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos());
|
||||
|
||||
if(tile instanceof IEnergySink && ((IEnergySink)tile).acceptsEnergyFrom(from, side.getOpposite()))
|
||||
{
|
||||
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;
|
||||
}
|
||||
} catch(Throwable e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
sent += IC2Integration.emitEnergy(from, tileEntity, side, currentSending);
|
||||
}
|
||||
|
||||
return sent;
|
||||
|
||||
Reference in new issue
Block a user