From 5530ab352b769f3893e766a69c63d340e9c7d04e Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Mon, 5 Aug 2013 11:59:14 -0400
Subject: [PATCH] Added model for multimeter

---
 .../textures/models/multimeter.png            | Bin 0 -> 1848 bytes
 .../model/ModelMultimeter.java                |  75 ++++++++++++++++++
 .../multimeter/BlockMultimeter.java           |  15 ++++
 .../multimeter/ItemBlockMultimeter.java       |   6 +-
 .../render/BlockRenderingHandler.java         |  12 +++
 .../render/RenderMultimeter.java              |  43 ++++++++++
 6 files changed, 148 insertions(+), 3 deletions(-)
 create mode 100644 resources/assets/resonantinduction/textures/models/multimeter.png
 create mode 100644 src/resonantinduction/model/ModelMultimeter.java

diff --git a/resources/assets/resonantinduction/textures/models/multimeter.png b/resources/assets/resonantinduction/textures/models/multimeter.png
new file mode 100644
index 0000000000000000000000000000000000000000..869357fc22c85642c79771cb092c9aaa7c9d81b0
GIT binary patch
literal 1848
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
Npnurejx)*VKLF4<Q6K;S

literal 0
HcmV?d00001

diff --git a/src/resonantinduction/model/ModelMultimeter.java b/src/resonantinduction/model/ModelMultimeter.java
new file mode 100644
index 00000000..f7932016
--- /dev/null
+++ b/src/resonantinduction/model/ModelMultimeter.java
@@ -0,0 +1,75 @@
+package resonantinduction.model;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+
+public class ModelMultimeter extends ModelBase
+{
+	// fields
+	ModelRenderer Base;
+	ModelRenderer secPanel;
+	ModelRenderer arm;
+	ModelRenderer button;
+	ModelRenderer arm2;
+	ModelRenderer infopanel;
+
+	public ModelMultimeter()
+	{
+		textureWidth = 128;
+		textureHeight = 128;
+
+		Base = new ModelRenderer(this, 0, 0);
+		Base.addBox(0F, 0F, 0F, 14, 14, 1);
+		Base.setRotationPoint(-7F, 9F, 7F);
+		Base.setTextureSize(128, 128);
+		Base.mirror = true;
+		setRotation(Base, 0F, 0F, 0F);
+		secPanel = new ModelRenderer(this, 0, 18);
+		secPanel.addBox(0F, 0F, 0F, 4, 8, 1);
+		secPanel.setRotationPoint(-6F, 10F, 6F);
+		secPanel.setTextureSize(128, 128);
+		secPanel.mirror = true;
+		setRotation(secPanel, 0F, 0F, 0F);
+		arm = new ModelRenderer(this, 0, 29);
+		arm.addBox(0F, 0F, 0F, 1, 9, 2);
+		arm.setRotationPoint(-3.5F, 13F, 5.5F);
+		arm.setTextureSize(128, 128);
+		arm.mirror = true;
+		setRotation(arm, 0F, 0F, 0F);
+		button = new ModelRenderer(this, 0, 43);
+		button.addBox(0F, 0F, 0F, 2, 1, 1);
+		button.setRotationPoint(-5F, 11F, 5.5F);
+		button.setTextureSize(128, 128);
+		button.mirror = true;
+		setRotation(button, 0F, 0F, 0F);
+		arm2 = new ModelRenderer(this, 10, 29);
+		arm2.addBox(0F, 0F, 0F, 1, 9, 2);
+		arm2.setRotationPoint(-5.5F, 13F, 5.5F);
+		arm2.setTextureSize(128, 128);
+		arm2.mirror = true;
+		setRotation(arm2, 0F, 0F, 0F);
+		infopanel = new ModelRenderer(this, 33, 0);
+		infopanel.addBox(0F, 0F, 0F, 7, 12, 1);
+		infopanel.setRotationPoint(-1F, 10F, 6.5F);
+		infopanel.setTextureSize(128, 128);
+		infopanel.mirror = true;
+		setRotation(infopanel, 0F, 0F, 0F);
+	}
+
+	public void render(float f5)
+	{
+		Base.render(f5);
+		secPanel.render(f5);
+		arm.render(f5);
+		button.render(f5);
+		arm2.render(f5);
+		infopanel.render(f5);
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z)
+	{
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+}
diff --git a/src/resonantinduction/multimeter/BlockMultimeter.java b/src/resonantinduction/multimeter/BlockMultimeter.java
index 06074c5a..4a58e56f 100644
--- a/src/resonantinduction/multimeter/BlockMultimeter.java
+++ b/src/resonantinduction/multimeter/BlockMultimeter.java
@@ -7,6 +7,8 @@ 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;
@@ -22,6 +24,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.ResonantInduction;
 import resonantinduction.base.BlockBase;
+import resonantinduction.render.BlockRenderingHandler;
 
 /**
  * A block that detects power.
@@ -103,6 +106,12 @@ public class BlockMultimeter extends BlockBase implements ITileEntityProvider
 	{
 		return true;
 	}
+	@SideOnly(Side.CLIENT)
+	@Override
+	public int getRenderType()
+	{
+		return BlockRenderingHandler.INSTANCE.getRenderId();
+	}
 
 	@Override
 	public boolean renderAsNormalBlock()
@@ -110,6 +119,12 @@ public class BlockMultimeter extends BlockBase implements ITileEntityProvider
 		return false;
 	}
 
+	@Override
+	public boolean isOpaqueCube()
+	{
+		return false;
+	}
+
 	@Override
 	public TileEntity createNewTileEntity(World world)
 	{
diff --git a/src/resonantinduction/multimeter/ItemBlockMultimeter.java b/src/resonantinduction/multimeter/ItemBlockMultimeter.java
index 66ff8f86..c64b4593 100644
--- a/src/resonantinduction/multimeter/ItemBlockMultimeter.java
+++ b/src/resonantinduction/multimeter/ItemBlockMultimeter.java
@@ -44,11 +44,11 @@ public class ItemBlockMultimeter extends ItemBlock
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World world, int x, int y, int z, int par7, float par8, float par9, float par10)
+	public boolean onItemUseFirst(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World world, int x, int y, int z, int par7, float par8, float par9, float par10)
 	{
 		if (!par2EntityPlayer.isSneaking())
 		{
-			if (!world.isRemote)
+			//if (!world.isRemote)
 			{
 				par2EntityPlayer.addChatMessage("Energy: " + TileEntityMultimeter.getDetectedEnergy(world.getBlockTileEntity(x, y, z)) + " J");
 			}
@@ -56,7 +56,7 @@ public class ItemBlockMultimeter extends ItemBlock
 			return true;
 		}
 
-		return super.onItemUse(par1ItemStack, par2EntityPlayer, world, x, y, z, par7, par8, par9, par10);
+		return super.onItemUseFirst(par1ItemStack, par2EntityPlayer, world, x, y, z, par7, par8, par9, par10);
 	}
 
 	public float getDetection(ItemStack itemStack)
diff --git a/src/resonantinduction/render/BlockRenderingHandler.java b/src/resonantinduction/render/BlockRenderingHandler.java
index 0a72bf33..507891cb 100644
--- a/src/resonantinduction/render/BlockRenderingHandler.java
+++ b/src/resonantinduction/render/BlockRenderingHandler.java
@@ -11,6 +11,7 @@ import org.lwjgl.opengl.GL11;
 
 import resonantinduction.battery.BlockBattery;
 import resonantinduction.contractor.BlockEMContractor;
+import resonantinduction.multimeter.BlockMultimeter;
 import resonantinduction.tesla.BlockTesla;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@@ -58,6 +59,17 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 			RenderBattery.MODEL.render(0.0625f);
 			GL11.glPopMatrix();
 		}
+		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);
+			FMLClientHandler.instance().getClient().renderEngine.func_110577_a(RenderMultimeter.TEXTURE);
+			RenderMultimeter.MODEL.render(0.0625f);
+			GL11.glPopMatrix();
+		}
 	}
 
 	@Override
diff --git a/src/resonantinduction/render/RenderMultimeter.java b/src/resonantinduction/render/RenderMultimeter.java
index 03361a22..11bccf9f 100644
--- a/src/resonantinduction/render/RenderMultimeter.java
+++ b/src/resonantinduction/render/RenderMultimeter.java
@@ -3,10 +3,14 @@ package resonantinduction.render;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
+import resonantinduction.ResonantInduction;
+import resonantinduction.contractor.TileEntityEMContractor;
+import resonantinduction.model.ModelMultimeter;
 import resonantinduction.multimeter.TileEntityMultimeter;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -20,12 +24,51 @@ import cpw.mods.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class RenderMultimeter extends TileEntitySpecialRenderer
 {
+	public static final ModelMultimeter MODEL = new ModelMultimeter();
+	public static final ResourceLocation TEXTURE = new ResourceLocation(ResonantInduction.DOMAIN, ResonantInduction.MODEL_TEXTURE_DIRECTORY + "multimeter.png");
+
 	@Override
 	public void renderTileEntityAt(TileEntity t, double x, double y, double z, float var8)
 	{
 		TileEntityMultimeter tileEntity = (TileEntityMultimeter) t;
 		ForgeDirection direction = ForgeDirection.getOrientation(tileEntity.worldObj.getBlockMetadata(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord));
 
+		GL11.glPushMatrix();
+		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)
+		{
+			case DOWN:
+				GL11.glRotatef(180, 0, 0, 1);
+				GL11.glTranslatef(0, -2, 0);
+				break;
+			case UP:
+				break;
+			case NORTH:
+				GL11.glTranslatef(1, 1, 0);
+				GL11.glRotatef(90, 0, 0, 1);
+				break;
+			case SOUTH:
+				GL11.glTranslatef(-1, 1, 0);
+				GL11.glRotatef(-90, 0, 0, 1);
+				break;
+			case WEST:
+				GL11.glTranslatef(0, 1, 1);
+				GL11.glRotatef(-90, 1, 0, 0);
+				break;
+			case EAST:
+				GL11.glTranslatef(0, 1, -1);
+				GL11.glRotatef(90, 1, 0, 0);
+				break;
+		}
+*/
+		this.func_110628_a(TEXTURE);
+		MODEL.render(0.0625f);
+
+		GL11.glPopMatrix();
+
 		/**
 		 * Render from side 2 to 6. This means render all sides excluding top and bottom.
 		 */