From 39b28888cd3092762840332c9c2bb755032caf13 Mon Sep 17 00:00:00 2001
From: Ben Spiers <ben.spiers22@gmail.com>
Date: Mon, 30 Sep 2013 02:51:27 +0100
Subject: [PATCH] Update some of the IC2 stuff in PartUniversalConductor

---
 .../multipart/PartUniversalConductor.java     | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/resonantinduction/wire/multipart/PartUniversalConductor.java b/src/resonantinduction/wire/multipart/PartUniversalConductor.java
index 1c7bf7c9..0ff60447 100644
--- a/src/resonantinduction/wire/multipart/PartUniversalConductor.java
+++ b/src/resonantinduction/wire/multipart/PartUniversalConductor.java
@@ -57,8 +57,35 @@ public abstract class PartUniversalConductor extends PartConductor implements IE
 	 */
 
 	@Override
-	public void update()
+	public void onWorldJoin()
 	{
+		super.onWorldJoin();
+		if (!this.world().isRemote)
+		{
+			if (!this.isAddedToEnergyNet)
+			{
+				this.initIC();
+			}
+		}
+	}
+
+	@Override
+	public void onAdded()
+	{
+		super.onAdded();
+		if (!this.world().isRemote)
+		{
+			if (!this.isAddedToEnergyNet)
+			{
+				this.initIC();
+			}
+		}
+	}
+
+	@Override
+	public void onChunkLoad()
+	{
+		super.onChunkLoad();
 		if (!this.world().isRemote)
 		{
 			if (!this.isAddedToEnergyNet)
@@ -81,12 +108,22 @@ public abstract class PartUniversalConductor extends PartConductor implements IE
 		this.unloadTileIC2();
 		super.onChunkUnload();
 	}
+	
+	@Override
+	public void onRemoved() {}
+
+	@Override
+	public void preRemove()
+	{
+		this.unloadTileIC2();
+		super.preRemove();
+	}
 
 	protected void initIC()
 	{
 		if (Compatibility.isIndustrialCraft2Loaded())
 		{
-			MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this));
+			MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) tile()));
 		}
 
 		this.isAddedToEnergyNet = true;
@@ -98,7 +135,7 @@ public abstract class PartUniversalConductor extends PartConductor implements IE
 		{
 			if (Compatibility.isIndustrialCraft2Loaded())
 			{
-				MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this));
+				MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) tile()));
 			}
 
 			this.isAddedToEnergyNet = false;