From aa86e9bf34d8fbf94449d15b5c74928933d3a507 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Thu, 20 Feb 2014 10:30:24 +0800
Subject: [PATCH] Fixed #245 - Multimeter rendering twice

---
 .../multimeter/MultimeterNetwork.java         | 11 +++++-
 .../electrical/multimeter/PartMultimeter.java | 37 +++++++------------
 .../multimeter/RenderMultimeter.java          |  3 +-
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java
index 4afc538c..d70d8297 100644
--- a/electrical/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java
+++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java
@@ -54,7 +54,7 @@ public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter
 	 * If the screen is not a perfect rectangle, don't render.
 	 */
 	public boolean isEnabled = true;
-	public PartMultimeter primaryRenderer = null;
+	public PartMultimeter primaryMultimeter = null;
 
 	public MultimeterNetwork()
 	{
@@ -65,6 +65,11 @@ public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter
 		graphs.add(fluidGraph);
 	}
 
+	public boolean isPrimary(PartMultimeter check)
+	{
+		return primaryMultimeter == check;
+	}
+
 	@Override
 	public void addConnector(PartMultimeter connector)
 	{
@@ -111,6 +116,7 @@ public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter
 	{
 		if (getConnectors().size() > 0)
 		{
+			primaryMultimeter = null;
 			upperBound = null;
 			lowerBound = null;
 			super.reconstruct();
@@ -146,6 +152,9 @@ public class MultimeterNetwork extends Network<MultimeterNetwork, PartMultimeter
 	{
 		node.setNetwork(this);
 
+		if (primaryMultimeter == null)
+			primaryMultimeter = node;
+		
 		if (upperBound == null)
 		{
 			upperBound = node.getPosition().translate(1);
diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
index 89bf20d4..f89f0ea9 100644
--- a/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
+++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
@@ -83,12 +83,15 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
 	private DetectMode detectMode = DetectMode.NONE;
 	private long redstoneTriggerLimit;
 
+	// TODO: Move warn settings over.
 	public boolean redstoneOn;
 	private byte side;
 	private int ticks;
 
 	private MultimeterNetwork network;
 
+	boolean isPrimary;
+
 	public void preparePlacement(int side, int itemDamage)
 	{
 		this.side = (byte) (side);
@@ -122,10 +125,6 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
 
 				getNetwork().reconstruct();
 			}
-			else
-			{
-				getNetwork().primaryRenderer = null;
-			}
 		}
 	}
 
@@ -342,7 +341,11 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
 	public void writeGraph(MCDataOutput packet)
 	{
 		packet.writeByte(2);
-		packet.writeNBTTagCompound(getNetwork().save());
+		isPrimary = getNetwork().isPrimary(this);
+		packet.writeBoolean(isPrimary);
+
+		if (isPrimary)
+			packet.writeNBTTagCompound(getNetwork().save());
 	}
 
 	@Override
@@ -368,7 +371,10 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
 		}
 		else if (packetID == 2)
 		{
-			getNetwork().load(packet.readNBTTagCompound());
+			isPrimary = packet.readBoolean();
+
+			if (isPrimary)
+				getNetwork().load(packet.readNBTTagCompound());
 		}
 	}
 
@@ -607,28 +613,11 @@ public class PartMultimeter extends JCuboidPart implements IConnector<Multimeter
 		return new universalelectricity.api.vector.Vector3(x(), y(), z());
 	}
 
-	/**
-	 * Only one multimeter renders the text.
-	 */
-	public boolean isPrimaryRendering()
-	{
-		if (getNetwork().primaryRenderer == null || !getNetwork().isValidConnector(getNetwork().primaryRenderer))
-		{
-			for (PartMultimeter m : getNetwork().getConnectors())
-			{
-				getNetwork().primaryRenderer = m;
-				break;
-			}
-		}
-
-		return getNetwork().primaryRenderer == this;
-	}
-
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Cuboid6 getRenderBounds()
 	{
-		if (isPrimaryRendering())
+		if (isPrimary)
 			return Cuboid6.full.copy().expand(Double.POSITIVE_INFINITY);
 
 		return Cuboid6.full;
diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
index f3a35522..90ceac4d 100644
--- a/electrical/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
+++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
@@ -145,7 +145,7 @@ public class RenderMultimeter implements ISimpleItemRenderer
 		 * Only one block renders this text.
 		 * Render all the multimeter text
 		 */
-		if (part.getNetwork().isEnabled && part.isPrimaryRendering())
+		if (part.getNetwork().isEnabled && part.isPrimary)
 		{
 			GL11.glPushMatrix();
 			GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
@@ -213,5 +213,4 @@ public class RenderMultimeter implements ISimpleItemRenderer
 		}
 
 	}
-
 }
\ No newline at end of file