From 251e936a968cbceef71b4f2280d64880c8099ec5 Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Tue, 21 May 2013 13:34:16 -0400
Subject: [PATCH] v5.5.6 Beta #5

*Better Chargepad model.
*Code cleanup.
---
 .../mods/mekanism/render/Chargepad.png        | Bin 4529 -> 4717 bytes
 .../client/MachineRenderingHandler.java       |   2 +-
 .../mekanism/client/ModelChargepad.java       |  41 +++++++++++++++---
 .../common/InventoryElectricChest.java        |   1 -
 4 files changed, 35 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 bin/minecraft/mods/mekanism/render/Chargepad.png

diff --git a/bin/minecraft/mods/mekanism/render/Chargepad.png b/bin/minecraft/mods/mekanism/render/Chargepad.png
old mode 100755
new mode 100644
index 30455b680d01f41a0e2ee93696e1462d6ad9eb12..4e096ad432f2f8c9a7e79b24dfad325b80e2ba2e
GIT binary patch
delta 1989
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
TUI-iP1#QQ16vmr=EHdwJE5q4j

delta 1799
zcmbV}`#aMM1Hiw_Tv~_|86lUPxib_S6UBrQ<G8*nGNH^ha!Fs8!mAPG-iYIx`*C~S
z8d7);XCrKG;Yl?!Ovqfey!{R5^V{dQ&+~jXF8rn1+y?`N7Hq97U83jK-7(J<h9&C@
zXJ<c|8mL`c?(caPWYHY>s;uAuVRDx0kmH`HsumUGm3SFY%X3C{o+AIIWKj(*kWjMF
z%7P}rGI@f~;J&*<i5?AeNI@n&XnS$<RWYlvv2pV;HSRgtFgg;SN}OMxM5W@=`9eUY
zR7DN|fHE>Nl{rZgCjjrF-yh&p8`=7_){ReGOs8%ol!L+9MelDZ-yzL(h#|4{?DR%<
zRzwO{akQnBjW%Jf2XQbR#H&<UCX=aKN!U9vGdpJg`l&=#1Xcu6jLyfs>mY6|4x;>p
zo7gZQDj})8QET&4kAG$!ZkgOFK##N*0U`4pWt_M;3h`VCCQgVcudAmQ_UI95bku&K
zGfY75R&PIxr4der4@<JUKTp@WnV?VuqxpJav9allrrRs4t0O1MsCAQV*8C|T?x&-j
zrN)PG8cMa2kcnb0zcmhBg)aHNx6^QENK;Y15{$5=n34@Xyxf|(wgy{_dk@0@=?^R#
z%O=iCT+tW$M%K9|3Xe}i%B}Qrg<$+jqWKemNmjPCVRcgKUyb`145L#0Jc7>4t&*>j
zCg>>=>m{r#+&eQ`-tTRQp|mi0F_#mz=L(~siQ3DakKOK$n;%Xf|Fkl$BshIlF-Iu%
zo>q1@N4^MI?45OTbWS{20J)f|Km(mp0XdJ7Va}kwx4ccze2SmPdY4e<K*bJ0vhdwV
z-K_@|_cO$c)$}zVKOl1}rL;%y&>nLK&wI70hc3qPzO(g0qoV`<ytb!3+Tx2Bf#4al
zhG<jTj_z>oN3&<58kI9$qBUzzS!8U!gBIU*<?vSFmE^+7zT@pKa6`tI=UTA{)8sl0
zd_k07M-)tw^kqNvx<&d6PQd!(*;4*WrYaSy5z1mdnT%z}X!q?DpMEpi{>JIYgt(Tr
z%ABq05XzM$?pfqF1f$tb{{^(rf5IGnL#NEp^TR!%GeFYSzHW32DeK##Vnw4dRBB8K
z1h@(AluhjAqgKGTH_bm;f8V&97k9CBL<-1Tsa=LX8*@r`K4rxGflG)kVbQu9ds+qq
z9M_}u1IIGjoQkSWqWmK^cR=1`_;V=|^7HB2{QFFGS*!90>d+H-`9++tu<($D!L`Dx
zN->ml<z##2Y|qSrlrFkj5_jPbey$x7D>|6Ky?nIr_cAElw~socq(+Ey;<s7<Q{mD_
zaIizl(sT^gtL``ZRihh2By@Z9n~lgf&c%*d;nW%Fn2(vK;5wIVw4ELms_Tv>A^Ltw
zmw-G;a>V}Z?c-n?Bl2PyLCTlZ+1+iB)wU3*LBE^o(3*3P=tfj2sP&uD@Dqo8FXDJ=
zy1;X#!J^bT#P|sFJotpoX!0tOS5*8w*M1+KGGM1PU6T1xJ?Z_6*w9e#Y(KPtAkGd8
zHeA@XNu1s#<TmSOi!f^FOVXBq;B>4j^vgd4XCDQ$8q#($w>5*Np2n19<9=-sQTB$X
z;LnY2*GShZlImApV$-PkxbeWr(w9YaZz5=E+trQZ?drYuk+*SPf6Y4x!LliwjP3>d
zcI(379gnJ^u=g$6?s<NUnch<bg|t-}Rfm*Sqmw`}t~?k&`@F6>;Ml<@mbZ^Qq!{n!
z`&lk=FYRtwz*sHXu7i-}{e3tP%BJg>Fhh^_h~+&I;_*u>U%o(5{tLY^XOy9!yn;fZ
zNv%73re4h}PR5}|L#^|O%gOhFi<bF$h>CR7E)=90-l<S7cL?)w=}h4?u+x3uQ7b=8
zG7G9sBC+fP_F32CkWv9n0;v{;V2X)**Xp#<gfQp<;X`4o21u=7Z_{g5NYU}3d9Ej-
zCzi<P<C$mR_@><T9^T4BaGuZO^-dj=vou5Ae4$dQLB0xJ|D{x=!7{M5iXFRsBL7U_
zg+1`c?1#m!?bYMypWhzS*85-eJmhSy9lb={3^He!;gY*<MP#KSk6lPL#zA)qqKvLv
zcQ_<Jgjj6d7jv|nUSL?b8%KwQIc+X<CI70=5C+WR4|n^}R!op=YHB)vBVsO$^;X3p
zvEJ)mM$w+k6qK)J&!$k%cw(1+fZiBZcnGlNLQue?mRfDVt!0QJCYGS5_4UUx`n2qH
zw_A1RJ@d(!wZxCEh=EwE>Q#D%M}q>aK-{%NRXtTM>cNUhQ8_x{`ed77TX3fP5v!j5
zpAD3|Yz_ns_AtIi&0p$ac1>k@inNEb(8Rw<e=S+(b4I^@$MneoVhKVP0;P~~AOJ7|
f{;lp`ru@VJA?oxummKTZz%OjA9jqF!cqjcI)q;Bp

diff --git a/src/minecraft/mekanism/client/MachineRenderingHandler.java b/src/minecraft/mekanism/client/MachineRenderingHandler.java
index 9dc7cacf6..8d2a93071 100644
--- a/src/minecraft/mekanism/client/MachineRenderingHandler.java
+++ b/src/minecraft/mekanism/client/MachineRenderingHandler.java
@@ -67,7 +67,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
     		else if(metadata == MachineType.CHARGEPAD.meta)
     		{
     			GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
-    			GL11.glTranslatef(0.0F, -1.4F, 0.0F);
+    			GL11.glTranslatef(0.0F, -1.1F, 0.0F);
     			GL11.glBindTexture(3553, FMLClientHandler.instance().getClient().renderEngine.getTexture("/mods/mekanism/render/Chargepad.png"));
     			chargepad.render(0.0625F);
     		}
diff --git a/src/minecraft/mekanism/client/ModelChargepad.java b/src/minecraft/mekanism/client/ModelChargepad.java
index 84e0a3532..54f42b0e6 100644
--- a/src/minecraft/mekanism/client/ModelChargepad.java
+++ b/src/minecraft/mekanism/client/ModelChargepad.java
@@ -4,10 +4,13 @@ import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
-public class ModelChargepad extends ModelBase 
+public class ModelChargepad extends ModelBase
 {
-	public ModelRenderer Shape1;
-	public ModelRenderer Shape2;
+	ModelRenderer Shape1;
+	ModelRenderer Shape2;
+	ModelRenderer Shape3;
+	ModelRenderer Shape4;
+	ModelRenderer Shape5;
 
 	public ModelChargepad() 
 	{
@@ -21,11 +24,29 @@ public class ModelChargepad extends ModelBase
 		Shape1.mirror = true;
 		setRotation(Shape1, 0F, 0F, 0F);
 		Shape2 = new ModelRenderer(this, 0, 18);
-		Shape2.addBox(0F, 0F, 0F, 4, 3, 2);
-		Shape2.setRotationPoint(-2F, 20F, 6F);
+		Shape2.addBox(0F, 0F, 0F, 8, 11, 2);
+		Shape2.setRotationPoint(-4F, 12F, 6F);
 		Shape2.setTextureSize(64, 64);
 		Shape2.mirror = true;
 		setRotation(Shape2, 0F, 0F, 0F);
+		Shape3 = new ModelRenderer(this, 0, 0);
+		Shape3.addBox(0F, 0F, 0F, 4, 3, 1);
+		Shape3.setRotationPoint(-2F, 14F, 5F);
+		Shape3.setTextureSize(64, 64);
+		Shape3.mirror = true;
+		setRotation(Shape3, 0F, 0F, 0F);
+		Shape4 = new ModelRenderer(this, 3, 8);
+		Shape4.addBox(0F, 0F, 0F, 2, 5, 2);
+		Shape4.setRotationPoint(-5F, 18F, 5F);
+		Shape4.setTextureSize(64, 64);
+		Shape4.mirror = true;
+		setRotation(Shape4, 0F, 0F, 0F);
+		Shape5 = new ModelRenderer(this, 3, 8);
+		Shape5.addBox(0F, 0F, 0F, 2, 5, 2);
+		Shape5.setRotationPoint(3F, 18F, 5F);
+		Shape5.setTextureSize(64, 64);
+		Shape5.mirror = true;
+		setRotation(Shape5, 0F, 0F, 0F);
 	}
 
 	@Override
@@ -35,15 +56,21 @@ public class ModelChargepad extends ModelBase
 		setRotationAngles(f, f1, f2, f3, f4, f5, entity);
 		Shape1.render(f5);
 		Shape2.render(f5);
+		Shape3.render(f5);
+		Shape4.render(f5);
+		Shape5.render(f5);
 	}
-	
+
 	public void render(float size)
 	{
 		Shape1.render(size);
 		Shape2.render(size);
+		Shape3.render(size);
+		Shape4.render(size);
+		Shape5.render(size);
 	}
 
-	private void setRotation(ModelRenderer model, float x, float y, float z)
+	private void setRotation(ModelRenderer model, float x, float y, float z) 
 	{
 		model.rotateAngleX = x;
 		model.rotateAngleY = y;
diff --git a/src/minecraft/mekanism/common/InventoryElectricChest.java b/src/minecraft/mekanism/common/InventoryElectricChest.java
index 7846be4ff..7d7b4b5a3 100644
--- a/src/minecraft/mekanism/common/InventoryElectricChest.java
+++ b/src/minecraft/mekanism/common/InventoryElectricChest.java
@@ -11,7 +11,6 @@ import net.minecraft.nbt.NBTTagList;
 public class InventoryElectricChest extends InventoryBasic
 {
 	public EntityPlayer entityPlayer;
-	public int size;
 	public boolean reading;
 	
 	public InventoryElectricChest(EntityPlayer player)