Got wire connections loading

src/resonantinduction/furnace/TileEntityAdvancedFurnace.java

@@ -19,7 +19,6 @@ import calclavia.lib.tile.EnergyStorage;
  * @author Calclavia
  * 
  */
-@UniversalClass
 public class TileEntityAdvancedFurnace extends TileEntityFurnace implements IEnergyInterface, IVoltage
 {
 	private static final float WATTAGE = 5;

src/resonantinduction/wire/part/FlatWire.java

@@ -6,6 +6,7 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.ForgeDirection;
@@ -85,7 +86,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 
 	public FlatWire()
 	{
-		super();
+
 	}
 
 	public FlatWire(int typeID)
@@ -95,7 +96,6 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 
 	public FlatWire(EnumWireMaterial type)
 	{
-		super();
 		material = type;
 	}
 
@@ -193,13 +193,15 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 		if ((connMap & 0x80000000) != 0) // compat with converters, recalc connections
 		{
 			if (dropIfCantStay())
+			{
 				return;
+			}
 
 			connMap = 0;
 
 			updateInternalConnections();
 
-			if (updateOpenConnections())
+			//if (updateOpenConnections())
 			{
 				updateExternalConnections();
 			}
@@ -236,6 +238,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 	{
 		if (!world().isRemote)
 		{
+
 			boolean changed = updateInternalConnections();
 			if (updateOpenConnections())
 			{
@@ -277,20 +280,90 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 		{
 			System.out.println(this.getNetwork());
 			System.out.println(Integer.toHexString(this.connMap));
+			this.getConnections();
 		}
 		return super.activate(player, part, item);
 	}
 
-	private void recalculateConnections()
+	@Override
+	public Object[] getConnections()
 	{
-		this.cachedConnections = new Object[4];
+		this.cachedConnections = new Object[6];
 
-		for (int i = 0; i < 4; i++)
+		/**
+		 * Calculate all external connections of this conductor.
+		 */
+		for (byte r = 0; r < 4; r++)
 		{
+			int absDir = Rotation.rotateSide(side, r);
+			ForgeDirection dir = ForgeDirection.getOrientation(absDir);
 
+			BlockCoord pos = new BlockCoord(tile()).offset(absDir);
+			TileEntity tileEntity = world().getBlockTileEntity(pos.x, pos.y, pos.z);
+
+			TileMultipart t = Utility.getMultipartTile(world(), pos);
+
+			if (this.canConnect(dir))
+			{
+				this.cachedConnections[r] = tileEntity;
+				System.out.println("EXT" + tileEntity);
 			}
 		}
 
+		// Connect to the face of the block the wire is placed on.
+		BlockCoord pos = new BlockCoord(tile()).offset(this.side);
+		TileEntity tileEntity = world().getBlockTileEntity(pos.x, pos.y, pos.z);
+
+		TileMultipart t = Utility.getMultipartTile(world(), pos);
+
+		if (this.canConnect(ForgeDirection.getOrientation(this.side)))
+		{
+			this.cachedConnections[this.side] = tileEntity;
+			System.out.println("EXT" + tileEntity);
+		}
+
+		for (byte r = 0; r < 4; r++)
+		{
+			int absDir = Rotation.rotateSide(side, r);
+
+			// Check straight ahead.
+			if (tile().partMap(PartMap.edgeBetween(absDir, side)) == null)
+			{
+				TMultiPart tp = tile().partMap(absDir);
+
+				if (tp instanceof FlatWire)
+				{
+					this.cachedConnections[absDir] = tp;
+					System.out.println("INT" + tp);
+					continue;
+				}
+			}
+
+			// Check Corner
+			BlockCoord cornerPos = new BlockCoord(tile());
+			cornerPos.offset(absDir);
+
+			if (!canConnectThroughCorner(cornerPos, absDir ^ 1, side))
+				continue;
+
+			cornerPos.offset(side);
+			TileMultipart tpCorner = Utility.getMultipartTile(world(), cornerPos);
+
+			if (tpCorner != null)
+			{
+				TMultiPart tp = tpCorner.partMap(absDir ^ 1);
+
+				if (tp instanceof FlatWire)
+				{
+					this.cachedConnections[absDir] = tp;
+					System.out.println("COR" + tp);
+				}
+			}
+		}
+
+		return this.cachedConnections;
+	}
+
 	public boolean canStay()
 	{
 		BlockCoord pos = new BlockCoord(tile()).offset(side);
@@ -378,11 +451,17 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 	{
 		int newConn = 0;
 		for (int r = 0; r < 4; r++)
+		{
 			if (connectInternal(r))
+			{
 				newConn |= 0x100 << r;
+			}
+		}
 
 		if (connectCenter())
+		{
 			newConn |= 0x10000;
+		}
 
 		if (newConn != (connMap & 0x10F00))
 		{
@@ -451,6 +530,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 			if (tp instanceof FlatWire)
 			{
 				boolean b = ((FlatWire) tp).connectCorner(this, Rotation.rotationTo(absDir ^ 1, side ^ 1));
+
 				if (b)
 				{
 					// let them connect to us
@@ -487,6 +567,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 		int absDir = Rotation.rotateSide(side, r);
 
 		BlockCoord pos = new BlockCoord(tile()).offset(absDir);
+
 		TileMultipart t = Utility.getMultipartTile(world(), pos);
 		if (t != null)
 		{
@@ -497,12 +578,12 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 				return ((FlatWire) tp).connectStraight(this, (r + 2) % 4);
 			}
 		}
-
+		else
-		return connectStraightOverride(absDir);
+		{
+			TileEntity tileEntity = world().getBlockTileEntity(pos.x, pos.y, pos.z);
+			return this.canConnect(tileEntity);
 		}
 
-	public boolean connectStraightOverride(int absDir)
-	{
 		return false;
 	}
 
@@ -673,12 +754,6 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
 		return false;
 	}
 
-	@Override
-	public boolean isBlockedOnSide(ForgeDirection side)
-	{
-		return false;
-	}
-
 	@Override
 	public String getType()
 	{

src/resonantinduction/wire/part/PartConductor.java

@@ -10,7 +10,6 @@ import universalelectricity.api.energy.IConductor;
 import universalelectricity.api.energy.IEnergyNetwork;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorHelper;
-import codechicken.multipart.TileMultipart;
 
 //@UniversalClass
 public abstract class PartConductor extends PartAdvanced implements IAdvancedConductor
@@ -75,24 +74,36 @@ public abstract class PartConductor extends PartAdvanced implements IAdvancedCon
 	}
 
 	/**
-	 * Shouldn't need to be overridden. Override connectionPrevented instead
+	 * Can externally connect?
 	 */
 	@Override
 	public boolean canConnect(ForgeDirection direction)
 	{
 		Vector3 connectPos = new Vector3(tile()).modifyPositionFromSide(direction);
 		TileEntity connectTile = connectPos.getTileEntity(world());
+		return CompatibilityModule.canConnect(connectTile, direction.getOpposite());
+	}
 
-		if (connectTile instanceof IConductor)
+	/**
+	 * Recalculates all the netwirk connections
+	 */
+	protected void recalculateConnections()
 	{
-			return canConnect((IConductor) connectTile);
+		this.cachedConnections = new Object[6];
+		/**
+		 * Calculate all external connections with this conductor.
+		 */
+		for (byte i = 0; i < 6; i++)
+		{
+			ForgeDirection side = ForgeDirection.getOrientation(i);
+
+			if (this.canConnect(side))
+			{
+				TileEntity tileEntity = VectorHelper.getTileEntityFromSide(world(), new Vector3(tile()), side);
+				cachedConnections[i] = tileEntity;
+			}
+		}
 	}
 
-		return false;
+	public abstract boolean canConnect(Object obj);
-	}
-
-	public abstract boolean canConnect(IConductor conductor);
-
-	public abstract boolean isBlockedOnSide(ForgeDirection side);
-
 }

src/resonantinduction/wire/part/PartWireBase.java

@@ -14,6 +14,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MovingObjectPosition;
 import resonantinduction.wire.EnumWireMaterial;
 import resonantinduction.wire.IAdvancedConductor;
+import universalelectricity.api.CompatibilityModule;
 import universalelectricity.api.energy.IConductor;
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.data.MCDataOutput;
@@ -29,11 +30,14 @@ public abstract class PartWireBase extends PartConductor
 	public EnumWireMaterial material = EnumWireMaterial.COPPER;
 	public boolean isInsulated = false;
 
-	public boolean canConnect(IConductor conductor)
+	/**
+	 * Can connect with this conductor?
+	 */
+	public boolean canConnect(Object obj)
 	{
-		if (conductor instanceof IAdvancedConductor)
+		if (obj instanceof IAdvancedConductor)
 		{
-			IAdvancedConductor wire = (IAdvancedConductor) conductor;
+			IAdvancedConductor wire = (IAdvancedConductor) obj;
 
 			if (wire.getMaterial() == getMaterial())
 			{
@@ -46,7 +50,7 @@ public abstract class PartWireBase extends PartConductor
 			}
 		}
 
-		return false;
+		return CompatibilityModule.isHandler(obj);
 	}
 
 	@Override