From b7e391ce8919feb268104702eb802f77426f4866 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Mon, 5 Aug 2013 12:10:43 -0400
Subject: [PATCH] Fixed multimeter item render

---
 .../textures/blocks/multimeter.png            | Bin 2138 -> 0 bytes
 .../multimeter/BlockMultimeter.java           |  37 ++----------------
 .../render/BlockRenderingHandler.java         |   6 +--
 .../render/RenderMultimeter.java              |   6 ++-
 4 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 resources/assets/resonantinduction/textures/blocks/multimeter.png

diff --git a/resources/assets/resonantinduction/textures/blocks/multimeter.png b/resources/assets/resonantinduction/textures/blocks/multimeter.png
deleted file mode 100644
index 36cd83f3d48f4bc3d9e9cae541fb0fc09e00ead8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2138
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
QZ~y=R07*qoM6N<$f~e^E82|tP

diff --git a/src/resonantinduction/multimeter/BlockMultimeter.java b/src/resonantinduction/multimeter/BlockMultimeter.java
index 4a58e56f..003bbda1 100644
--- a/src/resonantinduction/multimeter/BlockMultimeter.java
+++ b/src/resonantinduction/multimeter/BlockMultimeter.java
@@ -3,28 +3,17 @@
  */
 package resonantinduction.multimeter;
 
-import static net.minecraftforge.common.ForgeDirection.EAST;
-import static net.minecraftforge.common.ForgeDirection.NORTH;
-import static net.minecraftforge.common.ForgeDirection.SOUTH;
-import static net.minecraftforge.common.ForgeDirection.WEST;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Icon;
-import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.ResonantInduction;
 import resonantinduction.base.BlockBase;
 import resonantinduction.render.BlockRenderingHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 /**
  * A block that detects power.
@@ -34,11 +23,10 @@ import resonantinduction.render.BlockRenderingHandler;
  */
 public class BlockMultimeter extends BlockBase implements ITileEntityProvider
 {
-	private Icon machineIcon;
-
 	public BlockMultimeter(int id)
 	{
 		super("multimeter", id);
+		this.func_111022_d(ResonantInduction.PREFIX + "machine");
 	}
 
 	/**
@@ -50,24 +38,6 @@ public class BlockMultimeter extends BlockBase implements ITileEntityProvider
 		return ForgeDirection.getOrientation(side).ordinal();
 	}
 
-	@Override
-	public Icon getIcon(int side, int metadata)
-	{
-		if (side == metadata)
-		{
-			return this.blockIcon;
-		}
-
-		return this.machineIcon;
-	}
-
-	@Override
-	public void registerIcons(IconRegister iconRegister)
-	{
-		super.registerIcons(iconRegister);
-		this.machineIcon = iconRegister.registerIcon(ResonantInduction.PREFIX + "machine");
-	}
-
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9)
 	{
@@ -106,6 +76,7 @@ public class BlockMultimeter extends BlockBase implements ITileEntityProvider
 	{
 		return true;
 	}
+
 	@SideOnly(Side.CLIENT)
 	@Override
 	public int getRenderType()
diff --git a/src/resonantinduction/render/BlockRenderingHandler.java b/src/resonantinduction/render/BlockRenderingHandler.java
index 507891cb..5abb5e04 100644
--- a/src/resonantinduction/render/BlockRenderingHandler.java
+++ b/src/resonantinduction/render/BlockRenderingHandler.java
@@ -62,10 +62,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 		else if (block instanceof BlockMultimeter)
 		{
 			GL11.glPushMatrix();
-			GL11.glTranslated(-0.5, 1, -1);
-			// GL11.glTranslated(1.5, 1.5, -0.5);
-			GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
-			GL11.glRotatef(-180, 0.0F, 1, 1.0F);
+			GL11.glRotatef(180, 0, 1, 0);
+			GL11.glTranslated(0, -1, -0.7);
 			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(RenderMultimeter.TEXTURE);
 			RenderMultimeter.MODEL.render(0.0625f);
 			GL11.glPopMatrix();
diff --git a/src/resonantinduction/render/RenderMultimeter.java b/src/resonantinduction/render/RenderMultimeter.java
index 11bccf9f..f80a2229 100644
--- a/src/resonantinduction/render/RenderMultimeter.java
+++ b/src/resonantinduction/render/RenderMultimeter.java
@@ -34,9 +34,11 @@ public class RenderMultimeter extends TileEntitySpecialRenderer
 		ForgeDirection direction = ForgeDirection.getOrientation(tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord));
 
 		GL11.glPushMatrix();
+	/	GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
+		GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5);
+		//GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+		GL11.glRotatef(90F, 0, 0, 1);
 		GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5);
-		GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
-		GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
 /*
 		switch (direction)
 		{