From 8ef2f57c900749a272b0830aad4e004454c013f5 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 2 Jul 2016 16:39:33 -0400 Subject: [PATCH] Re-add part of IC2 implementation. This crashing is weird --- src/main/java/mekanism/common/util/CableUtils.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index d8f19c4ba..b4c2a220a 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,5 +1,9 @@ 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; @@ -280,7 +284,7 @@ public final class CableUtils sent += used*general.FROM_RF; } } - /*else if(MekanismUtils.useIC2()) + else if(MekanismUtils.useIC2()) { IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); @@ -290,7 +294,7 @@ public final class CableUtils toSend = Math.min(Math.min(toSend, ((IEnergySink)tile).getDemandedEnergy()), Integer.MAX_VALUE); sent += (toSend - (((IEnergySink)tile).injectEnergy(side.getOpposite(), toSend, 0)))*general.FROM_IC2; } - }*/ + } return sent; }