From b4650a95f28b62d0d9aeb7177963ef8e7b1e3e72 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sun, 4 Aug 2013 21:47:28 -0400
Subject: [PATCH 1/2] Added modular battery box click zones

---
 .../battery/BlockBattery.java                 | 58 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/resonantinduction/battery/BlockBattery.java b/src/resonantinduction/battery/BlockBattery.java
index b2185002..023c3c93 100644
--- a/src/resonantinduction/battery/BlockBattery.java
+++ b/src/resonantinduction/battery/BlockBattery.java
@@ -4,7 +4,6 @@
 package resonantinduction.battery;
 
 import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -12,6 +11,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.ResonantInduction;
+import resonantinduction.api.IBattery;
 import resonantinduction.base.BlockBase;
 import resonantinduction.render.BlockRenderingHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -32,7 +32,7 @@ public class BlockBattery extends BlockBase implements ITileEntityProvider
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9)
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float xClick, float yClick, float zClick)
 	{
 		if (entityPlayer.isSneaking())
 		{
@@ -40,7 +40,61 @@ public class BlockBattery extends BlockBase implements ITileEntityProvider
 		}
 		else
 		{
+			if (entityPlayer.getCurrentEquippedItem() != null)
+			{
+				if (entityPlayer.getCurrentEquippedItem().getItem() instanceof IBattery)
+				{
+					if (side != 0 && side != 1)
+					{
+						/**
+						 * Place cells into block. 2 Dimensional Click Zone
+						 */
+						float xHit = 0;
+						float yHit = yClick;
 
+						if (side == 2 || side == 3)
+						{
+							xHit = xClick;
+
+							if (side == 2)
+							{
+								xHit = 1 - xHit;
+							}
+						}
+						else if (side == 4 || side == 5)
+						{
+							xHit = zClick;
+
+							if (side == 5)
+							{
+								xHit = 1 - xHit;
+							}
+						}
+
+						// Convert to quadrant coords.
+						xHit -= 0.5f;
+						yHit -= 0.5f;
+
+						// Quadrant 1
+						if (xHit > 0 && yHit > 0)
+						{
+
+						}// Quadrant 2
+						if (xHit > 0 && yHit < 0)
+						{
+
+						}// Quadrant 3
+						if (xHit < 0 && yHit < 0)
+						{
+
+						}// Quadrant 4
+						if (xHit < 0 && yHit > 0)
+						{
+
+						}
+					}
+				}
+			}
 		}
 
 		return true;

From 2a2dcb16df6a57fc15b9fd53fee8ad2bdeb5c1b7 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Sun, 4 Aug 2013 22:06:57 -0400
Subject: [PATCH 2/2] Fixed multimeter GUI bar

---
 .../textures/gui/gui_multimeter.png           | Bin 6115 -> 5664 bytes
 .../multimeter/GuiMultimeter.java             |  17 +++++++----------
 .../multimeter/TileEntityMultimeter.java      |  10 ++++++++++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/resources/assets/resonantinduction/textures/gui/gui_multimeter.png b/resources/assets/resonantinduction/textures/gui/gui_multimeter.png
index d7719119c5f36ed093cb9a89f1dbb7cbd13ff9c7..e9a16fbebb0670b38c30b13bfffaf09f14653c82 100644
GIT binary patch
delta 2730
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
Uguj1)(-Z)r(=o@|BSC5Z0p_C2c>n+a

delta 3183
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
K!J2JFj{hH|Ihn5j

diff --git a/src/resonantinduction/multimeter/GuiMultimeter.java b/src/resonantinduction/multimeter/GuiMultimeter.java
index 1904d9fb..d56e532b 100644
--- a/src/resonantinduction/multimeter/GuiMultimeter.java
+++ b/src/resonantinduction/multimeter/GuiMultimeter.java
@@ -75,10 +75,10 @@ public class GuiMultimeter extends GuiContainer
 	protected void drawGuiContainerForegroundLayer(int par1, int par2)
 	{
 		String s = this.tileEntity.getBlockType().getLocalizedName();
-		this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 6, 4210752);
-		this.fontRenderer.drawString("Energy: " + Math.round(this.tileEntity.getDetectedEnergy()) + " J", 35, 32, 4210752);
-		this.fontRenderer.drawString("Average Energy: " + Math.round(this.tileEntity.getAverageDetectedEnergy()) + " J", 35, 20, 4210752);
-		this.fontRenderer.drawString("Output Redstone If... ", 35, 46, 4210752);
+		this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 15, 4210752);
+		this.fontRenderer.drawString("Average Energy: " + Math.round(this.tileEntity.getAverageDetectedEnergy()) + " J", 35, 25, 4210752);
+		this.fontRenderer.drawString("Energy: " + Math.round(this.tileEntity.getDetectedEnergy()) + " J", 35, 35, 4210752);
+		this.fontRenderer.drawString("Output Redstone If... ", 35, 54, 4210752);
 		this.fontRenderer.drawString(this.tileEntity.getMode().display, 35, 65, 4210752);
 		this.fontRenderer.drawString("KiloJoules", 35, 100, 4210752);
 
@@ -95,12 +95,9 @@ public class GuiMultimeter extends GuiContainer
 		GL11.glColor4f(1, 1, 1, 1);
 		this.drawTexturedModalRect(this.containerWidth, this.containerHeight, 0, 0, this.xSize, this.ySize);
 
-		/*
-		 * if (this.tileEntity.getMode() != DetectMode.NONE) { int length = (int)
-		 * (Math.abs(this.tileEntity.getDetectedEnergy() - this.tileEntity.getLimit()) /
-		 * this.tileEntity.getLimit()) * 110; this.drawTexturedModalRect(this.containerWidth + 13,
-		 * this.containerHeight + 128 - length, 176, 0, 30, length); }
-		 */
+		int length = (int) (this.tileEntity.getDetectedEnergy() / this.tileEntity.getPeak()) * 117;
+		// length = 177;
+		this.drawTexturedModalRect(this.containerWidth + 13, this.containerHeight + 133 - length, 176, 117 - length, 30, length);
 	}
 
 	@Override
diff --git a/src/resonantinduction/multimeter/TileEntityMultimeter.java b/src/resonantinduction/multimeter/TileEntityMultimeter.java
index cf9f0ebe..4721e62a 100644
--- a/src/resonantinduction/multimeter/TileEntityMultimeter.java
+++ b/src/resonantinduction/multimeter/TileEntityMultimeter.java
@@ -37,6 +37,7 @@ public class TileEntityMultimeter extends TileEntityBase implements IPacketRecei
 	}
 
 	private DetectMode detectMode = DetectMode.NONE;
+	private float peakDetection;
 	private float energyLimit;
 	private float detectedEnergy;
 	private float detectedAverageEnergy;
@@ -52,6 +53,7 @@ public class TileEntityMultimeter extends TileEntityBase implements IPacketRecei
 			float prevDetectedEnergy = this.detectedEnergy;
 			this.detectedEnergy = this.doGetDetectedEnergy();
 			this.detectedAverageEnergy = (detectedAverageEnergy + this.detectedEnergy) / 2;
+			this.peakDetection = Math.max(peakDetection, this.detectedEnergy);
 
 			boolean outputRedstone = false;
 
@@ -193,4 +195,12 @@ public class TileEntityMultimeter extends TileEntityBase implements IPacketRecei
 		return this.energyLimit;
 	}
 
+	/**
+	 * @return
+	 */
+	public float getPeak()
+	{
+		return this.peakDetection;
+	}
+
 }