From 64b3690463704caa35b9fa0ab00d54c973085f8d Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sat, 22 Feb 2014 18:40:24 +0800
Subject: [PATCH] Multimeter now rotates text based on ground placement

---
 .../electrical/multimeter/ItemMultimeter.java              | 5 ++++-
 .../electrical/multimeter/PartMultimeter.java              | 5 ++++-
 .../electrical/multimeter/RenderMultimeter.java            | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java
index 4e1df7c8..f6e92380 100644
--- a/electrical/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java
+++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java
@@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.Icon;
+import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.prefab.part.IHighlight;
@@ -37,7 +38,9 @@ public class ItemMultimeter extends JItemMultiPart implements IHighlight
 
 		if (part != null)
 		{
-			part.preparePlacement(side, itemStack.getItemDamage());
+			int l = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+			int facing = l == 0 ? 2 : (l == 1 ? 5 : (l == 2 ? 3 : (l == 3 ? 4 : 0)));
+			part.preparePlacement(side, facing);
 		}
 
 		return part;
diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
index cc180675..2fea2e05 100644
--- a/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
+++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
@@ -300,6 +300,7 @@ public class PartMultimeter extends PartFace implements IConnector<MultimeterNet
 	{
 		packet.readByte();
 		placementSide = ForgeDirection.getOrientation(packet.readByte());
+		facing = packet.readByte();
 		detectMode = DetectMode.values()[packet.readByte()];
 		getNetwork().center = new universalelectricity.api.vector.Vector3(packet.readNBTTagCompound());
 		getNetwork().size = new universalelectricity.api.vector.Vector3(packet.readNBTTagCompound());
@@ -311,7 +312,8 @@ public class PartMultimeter extends PartFace implements IConnector<MultimeterNet
 	{
 		packet.writeByte(0);
 		packet.writeByte(placementSide.ordinal());
-		packet.writeByte((byte) detectMode.ordinal());
+		packet.writeByte(facing);
+		packet.writeByte(detectMode.ordinal());
 		packet.writeNBTTagCompound(getNetwork().center.writeToNBT(new NBTTagCompound()));
 		packet.writeNBTTagCompound(getNetwork().size.writeToNBT(new NBTTagCompound()));
 		packet.writeBoolean(getNetwork().isEnabled);
@@ -338,6 +340,7 @@ public class PartMultimeter extends PartFace implements IConnector<MultimeterNet
 		if (packetID == 0)
 		{
 			placementSide = ForgeDirection.getOrientation(packet.readByte());
+			facing = packet.readByte();
 			detectMode = DetectMode.values()[packet.readByte()];
 			getNetwork().center = new universalelectricity.api.vector.Vector3(packet.readNBTTagCompound());
 			getNetwork().size = new universalelectricity.api.vector.Vector3(packet.readNBTTagCompound());
diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
index f6d5cadb..d1025305 100644
--- a/electrical/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
+++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
@@ -178,6 +178,13 @@ public class RenderMultimeter implements ISimpleItemRenderer
 			Vector3 centerTranslation = part.getNetwork().center.clone().subtract(part.x(), part.y(), part.z()).add(-0.5);
 			GL11.glTranslated(centerTranslation.x, centerTranslation.y, centerTranslation.z);
 			RenderUtility.rotateFaceBlockToSideOutwards(part.getDirection().getOpposite());
+
+			if (part.getDirection().offsetY != 0)
+			{
+				GL11.glRotatef(90, 0, 1, 0);
+				RenderUtility.rotateBlockBasedOnDirection(part.getFacing());
+			}
+			
 			GL11.glTranslated(0, 0.07, 0);
 
 			List<String> information = new ArrayList<String>();