From a09f0cfd164a50510bb1446c7f73e990c01eaf6d Mon Sep 17 00:00:00 2001
From: Timo Ley <timo.ley@tilera.dev>
Date: Sun, 30 Oct 2022 12:45:21 +0100
Subject: [PATCH] fix: universal cable connection to IC2

---
 .../common/base/EnergyAcceptorWrapper.java    |  5 ++--
 .../common/multipart/PartUniversalCable.java  |  6 ++---
 .../java/mekanism/common/util/CableUtils.java | 25 ++++++++++++-------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
index 5ead4daa5..9fd36df50 100644
--- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
+++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
@@ -4,6 +4,7 @@ import ic2.api.energy.tile.IEnergySink;
 import mekanism.api.Coord4D;
 import mekanism.api.MekanismConfig.general;
 import mekanism.api.energy.IStrictEnergyAcceptor;
+import mekanism.common.util.CableUtils;
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -30,9 +31,9 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
 		{
 			wrapper = new RFAcceptor((IEnergyReceiver)tileEntity);
 		}
-		else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink)
+		else if(MekanismUtils.useIC2() && CableUtils.getIC2Tile(tileEntity) instanceof IEnergySink)
 		{
-			wrapper = new IC2Acceptor((IEnergySink)tileEntity);
+			wrapper = new IC2Acceptor((IEnergySink)CableUtils.getIC2Tile(tileEntity));
 		}
 		
 		if(wrapper != null)
diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java
index 70970d683..78846c352 100644
--- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java
+++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java
@@ -105,9 +105,9 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
 
 							((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(toDraw*general.TO_TE), false);
 						}
-						else if(MekanismUtils.useIC2() && outputter instanceof IEnergySource)
+						else if(MekanismUtils.useIC2() && CableUtils.getIC2Tile(outputter) instanceof IEnergySource)
 						{
-							double received = Math.min(((IEnergySource)outputter).getOfferedEnergy() * general.FROM_IC2, canDraw);
+							double received = Math.min(((IEnergySource)CableUtils.getIC2Tile(outputter)).getOfferedEnergy() * general.FROM_IC2, canDraw);
 							double toDraw = received;
 
 							if(received > 0)
@@ -115,7 +115,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
 								toDraw -= takeEnergy(received, true);
 							}
 
-							((IEnergySource)outputter).drawEnergy(toDraw * general.TO_IC2);
+							((IEnergySource)CableUtils.getIC2Tile(outputter)).drawEnergy(toDraw * general.TO_IC2);
 						}
 					}
 				}
diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java
index 9e8af6cd4..dc8f05256 100644
--- a/src/main/java/mekanism/common/util/CableUtils.java
+++ b/src/main/java/mekanism/common/util/CableUtils.java
@@ -27,7 +27,7 @@ public final class CableUtils
 	public static boolean isEnergyAcceptor(TileEntity tileEntity)
 	{
 		return (tileEntity instanceof IStrictEnergyAcceptor ||
-				(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) ||
+				(MekanismUtils.useIC2() && getIC2Tile(tileEntity) instanceof IEnergySink) ||
 				(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver));
 	}
 
@@ -108,7 +108,7 @@ public final class CableUtils
 	public static boolean isOutputter(TileEntity tileEntity, ForgeDirection side)
 	{
 		return (tileEntity instanceof ICableOutputter && ((ICableOutputter)tileEntity).canOutputTo(side.getOpposite())) ||
-				(MekanismUtils.useIC2() && tileEntity instanceof IEnergySource && ((IEnergySource)tileEntity).emitsEnergyTo(null, side.getOpposite())) ||
+				(MekanismUtils.useIC2() && getIC2Tile(tileEntity) instanceof IEnergySource && ((IEnergySource)getIC2Tile(tileEntity)).emitsEnergyTo(null, side.getOpposite())) ||
 				(MekanismUtils.useRF() && tileEntity instanceof IEnergyProvider && ((IEnergyConnection)tileEntity).canConnectEnergy(side.getOpposite()));
 	}
 
@@ -126,9 +126,9 @@ public final class CableUtils
 				return true;
 			}
 		}
-		else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergyAcceptor)
+		else if(MekanismUtils.useIC2() && getIC2Tile(tileEntity) instanceof IEnergyAcceptor)
 		{
-			if(((IEnergyAcceptor)tileEntity).acceptsEnergyFrom(orig, side.getOpposite()))
+			if(((IEnergyAcceptor)getIC2Tile(tileEntity)).acceptsEnergyFrom(orig, side.getOpposite()))
 			{
 				return true;
 			}
@@ -246,16 +246,23 @@ public final class CableUtils
 				sent += used*general.FROM_TE;
 			}
 		}
-		else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink)
+		else if(MekanismUtils.useIC2() && getIC2Tile(tileEntity) instanceof IEnergySink)
 		{
-			if(((IEnergySink)tileEntity).acceptsEnergyFrom((TileEntity)from, side.getOpposite()))
+			IEnergySink sink = (IEnergySink) getIC2Tile(tileEntity);
+			if(sink.acceptsEnergyFrom((TileEntity)from, side.getOpposite()))
 			{
-				double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(((IEnergySink)tileEntity).getSinkTier())*general.FROM_IC2);
-				toSend = Math.min(Math.min(toSend, ((IEnergySink)tileEntity).getDemandedEnergy()*general.FROM_IC2), Integer.MAX_VALUE);
-				sent += (toSend - (((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2));
+				double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(sink.getSinkTier())*general.FROM_IC2);
+				toSend = Math.min(Math.min(toSend, sink.getDemandedEnergy()*general.FROM_IC2), Integer.MAX_VALUE);
+				sent += (toSend - (sink.injectEnergy(side.getOpposite(), toSend*general.TO_IC2, 0)*general.FROM_IC2));
 			}
 		}
 
 		return sent;
 	}
+
+	public static TileEntity getIC2Tile(TileEntity tileEntity) {
+		if (tileEntity == null) return null;
+		return EnergyNet.instance.getTileEntity(tileEntity.getWorldObj(), tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord);
+	}
+
 }