From 3992ead0ff5d4e271707baca8d7959602507f973 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 2 Jul 2016 17:23:34 -0400 Subject: [PATCH] Abstract away cable IC2 integration. Hopefully this works --- .../common/integration/IC2Integration.java | 58 +++++++++++++++++++ .../java/mekanism/common/util/CableUtils.java | 43 +++----------- 2 files changed, 66 insertions(+), 35 deletions(-) create mode 100644 src/main/java/mekanism/common/integration/IC2Integration.java diff --git a/src/main/java/mekanism/common/integration/IC2Integration.java b/src/main/java/mekanism/common/integration/IC2Integration.java new file mode 100644 index 000000000..2ae2731cc --- /dev/null +++ b/src/main/java/mekanism/common/integration/IC2Integration.java @@ -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; + } +} diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index d0202f2bf..981705b58 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -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;