From c6e3320609d889941fefef204d0377cb11facded Mon Sep 17 00:00:00 2001
From: Rseifert <rseifert.phone@gmail.com>
Date: Thu, 17 Jan 2013 20:32:53 -0500
Subject: [PATCH] Changed out the model for the Block

*Still need to do the item view
*I also removed some unneeded textures
*Change gitignore to not include thumb.db files since they always seem
to change
---
 .gitignore                                    |   1 +
 resources/assemblyline/textures/Grey64.png    | Bin 534 -> 0 bytes
 resources/assemblyline/textures/dropbox.png   | Bin 950 -> 0 bytes
 resources/assemblyline/textures/ejector.png   | Bin 1054 -> 0 bytes
 .../assemblyline/textures/rejector.png        | Bin
 resources/assemblyline/textures/sorter.png    | Bin 1054 -> 0 bytes
 .../client/model/ModelRejectorPiston.java     | 170 ++++++++++++++++++
 .../client/render/RenderRejector.java         |   7 +-
 8 files changed, 175 insertions(+), 3 deletions(-)
 delete mode 100644 resources/assemblyline/textures/Grey64.png
 delete mode 100644 resources/assemblyline/textures/dropbox.png
 delete mode 100644 resources/assemblyline/textures/ejector.png
 rename models/Ejector.png => resources/assemblyline/textures/rejector.png (100%)
 delete mode 100644 resources/assemblyline/textures/sorter.png
 create mode 100644 src/minecraft/assemblyline/client/model/ModelRejectorPiston.java

diff --git a/.gitignore b/.gitignore
index 49ec8582..afa6ceb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.bat
 *.sh
+*.db
 /*/
 LICENSE.txt
 CHANGELOG
diff --git a/resources/assemblyline/textures/Grey64.png b/resources/assemblyline/textures/Grey64.png
deleted file mode 100644
index 999e6c052e3a9128197b3e86f0919dbe4c916180..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 534
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1SEZ8zRdwrjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc4XZs}978JN-d=X(WnkcGK47{2>&YGb#tuxc
z*Dhx3yVSg%;Rh#I07DML<7fxQ4U9ecjI0OP4EC{#Fi0QxAvP*Ow;-`Nz|3prI;l$D
R(hL}v44$rjF6*2UngIJipO63m

diff --git a/resources/assemblyline/textures/dropbox.png b/resources/assemblyline/textures/dropbox.png
deleted file mode 100644
index 02f2d9655fd3d33747e27e6c7ae010da0f6bf0f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 950
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`!Tzu?;#;+KCpE58on|Zo8hE&{o
zd)MCYv4cp%$LSqS&N(k<HBHhEcq@5>ty5!>$Nt)`sjiN$hgnxluweYMQn!$I)fqAA
z_nZC%+q50oSU=yTv6J&tjm>`Z&qjSO7`r`}990QgV3<6;fkA<RgMq1mK|-RsRC4P{
zbK4yq6TR;XGKx+1U>CpnwcN!e=B>Z<yl^$4FHgiSlzb>Y-zdWnKb5&;<|2(a+10B~
zo#1tBSfp`J=FRuM#q3NvY7<|{JpA^|Oi8J3Z^hZlP}e|_!asj4{N|n7wW*^c?dqAN
zMM^JY_%4_@P6_yC!`{(hVeWTWWI<HxukUqj^SBM>a=w4Y=)l0^(XeaH?^V|y*Sp=0
z;IXRIvfuh|UAVEX0k25xLEY61e;Js?7RddXW3W%^j7$&<r<E|{x^K$^&q=EVZ(hl=
zMxV)LMv3Ge247`{L>Gn*1_8zmmwV<<FR@Hj*id?gW!oOsoZpXTO5Rz-u+z9vKc96c
zx0m+3^E_#%E#~@OetR}IB=qa9i6)Qom0x!6j}Fe5eeBdalhiD=+(_0hyuC}9MIDqg
z+ZfdSQ(wz0(4KKVL*u}H6^(p_vus}!I9V9W<jyXMKEN}F!@&s{u+Z>DrWUMzV|#!0
zcFx>yFV=1h&u3>j@s@SZt^Zeem7?^Y`=wvL;`HdC*NyII2kB0BdB%D5!RJo%N3SZq
z^DU;KU+&0<c@nWLCuTBT+4FVhuGmHTO8G7gclcZ1IEBAm*S&{x*QCE`;f(pY;je`c
zNed{X|4Z2F{$bteRXk^O7fy)<g{=Ss3j;E>Te(5^+3$lZ-v566!ivqVi@{R;sZIV4
z?emhy)HwuZ%G&HaJLBmdl?E*|eJlskSXVs%I(uF+=g#UcWtKOXgf{rGRFpnBK1=Z7
z?OE?XT&`cFA^^1O!cm!oe~WgfZ+q7HGSp~eo}u9+;V*_vF>!jqUV@sgHg<ZpCyP6_
zH!NP9D%Gp>?p@4{*u?k7^*8_itq{F;eDUkosZ|vc+~1vh7}C>EmsGrX#An6i@s&-C
r(a--sPt{-6&)`4?<{bpMA+VpZR$9eJ?d%3neq``;^>bP0l+XkK2Y7pe

diff --git a/resources/assemblyline/textures/ejector.png b/resources/assemblyline/textures/ejector.png
deleted file mode 100644
index feba2e00164af67757833c7dcc1fc4d71ec8f3c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1054
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZuR2IkG4E{-7;ac^fkP7*fcab5nrAcpZAQ+J5i
zomN$yhc+A9q+3cfx+Zw8GA+72>1+I|Wk8_&x_<A9x!X3+Ik$d!+x1O4yo+zQn=QLP
z=fIm^(`^|nWcc)y`;R|PjXC{;hhfVT`L+LVhFY>sEo5LgHRX~z3q#GmsgkS=sa`LI
znHcQupXy<1Fk1SBlaXP5eySUz!_1&xEes9kw;L^HSm2{s>%?&2dGyRchJa;L>=YRu
zd|rEIMQj<f^4${~q%Ai8D>dH#(#By)#k0Kf2TTr6>b_|;{(O8ccmrETy|AxrWAuS5
zPqY2^RSMpi$0VpE`#?<KWnI(Gv$6@Vzhr+ozL6!)Z|0%ZRtI)P?T_1d|KHx}%-T8E
z?W>RO?fYzA*MGzKXpJa?F{g6)Y-Wap&nw@AG6ZbfVwQ-Dt;pZBO-}1((EswQd)ou5
z&j$Wwy#C?rg1|PWhPSyXR{RCOZR=it|Mk9Cnzg~#E_@@KK>C6=x(<8RrTu*7y1-IN
z-0vyF_J)<Gw$^W2$G2hYp|pkD>laqJmXtRHrZZP@s=t$Gzr&D_z{}3Cz)kk97Q=zu
z*xp8lfW>`zq6`nVtvlwxup-cXI~PMiba=7?!<7|_qgfettX*v=z>sz2;@YOY4BJah
z+4$`FKb$Z#n~>CCB+I$m?`*YAjy4;^5rzX&3dg>iY-Vzp6?8;}iNSE+@|mIxm!>GG
z2{Lqiv^~3~hQ}wkYlce<e^XLW>NPpO0`3<NU%41ECM-(&>hZOR`-au?dTT@fw^cwb
z&pt=}S^xgN-QPd|eja^qy0rTL@2`)&eYTysb+qyF&L7K*7smgwJOAxNefIMQru&&|
zxL$mkH%nck`#@#ZRn_2P_8;FK-mT}{^Yh0_ZzmSn*9@`=Ywo{HV{Rx>m7FcW(DT*$
zZVtnQbt=iiObr|Bme1y8xHL5-$BDt<+WV5tj1Idd_4sly9Q!plZ(HhJmRB=H{duZ)
z-Iklpcj4W`D}raL8G~1={A}mDz<A^#Fi!}SJH*(@GB6yG6`1bN&cIN}e&p$8Mh1sF
jjD<f-2BY*5#vi;{|1OpsZSgDsx}U+*)z4*}Q$iB}E&aEi

diff --git a/models/Ejector.png b/resources/assemblyline/textures/rejector.png
similarity index 100%
rename from models/Ejector.png
rename to resources/assemblyline/textures/rejector.png
diff --git a/resources/assemblyline/textures/sorter.png b/resources/assemblyline/textures/sorter.png
deleted file mode 100644
index feba2e00164af67757833c7dcc1fc4d71ec8f3c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1054
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZuR2IkG4E{-7;ac^fkP7*fcab5nrAcpZAQ+J5i
zomN$yhc+A9q+3cfx+Zw8GA+72>1+I|Wk8_&x_<A9x!X3+Ik$d!+x1O4yo+zQn=QLP
z=fIm^(`^|nWcc)y`;R|PjXC{;hhfVT`L+LVhFY>sEo5LgHRX~z3q#GmsgkS=sa`LI
znHcQupXy<1Fk1SBlaXP5eySUz!_1&xEes9kw;L^HSm2{s>%?&2dGyRchJa;L>=YRu
zd|rEIMQj<f^4${~q%Ai8D>dH#(#By)#k0Kf2TTr6>b_|;{(O8ccmrETy|AxrWAuS5
zPqY2^RSMpi$0VpE`#?<KWnI(Gv$6@Vzhr+ozL6!)Z|0%ZRtI)P?T_1d|KHx}%-T8E
z?W>RO?fYzA*MGzKXpJa?F{g6)Y-Wap&nw@AG6ZbfVwQ-Dt;pZBO-}1((EswQd)ou5
z&j$Wwy#C?rg1|PWhPSyXR{RCOZR=it|Mk9Cnzg~#E_@@KK>C6=x(<8RrTu*7y1-IN
z-0vyF_J)<Gw$^W2$G2hYp|pkD>laqJmXtRHrZZP@s=t$Gzr&D_z{}3Cz)kk97Q=zu
z*xp8lfW>`zq6`nVtvlwxup-cXI~PMiba=7?!<7|_qgfettX*v=z>sz2;@YOY4BJah
z+4$`FKb$Z#n~>CCB+I$m?`*YAjy4;^5rzX&3dg>iY-Vzp6?8;}iNSE+@|mIxm!>GG
z2{Lqiv^~3~hQ}wkYlce<e^XLW>NPpO0`3<NU%41ECM-(&>hZOR`-au?dTT@fw^cwb
z&pt=}S^xgN-QPd|eja^qy0rTL@2`)&eYTysb+qyF&L7K*7smgwJOAxNefIMQru&&|
zxL$mkH%nck`#@#ZRn_2P_8;FK-mT}{^Yh0_ZzmSn*9@`=Ywo{HV{Rx>m7FcW(DT*$
zZVtnQbt=iiObr|Bme1y8xHL5-$BDt<+WV5tj1Idd_4sly9Q!plZ(HhJmRB=H{duZ)
z-Iklpcj4W`D}raL8G~1={A}mDz<A^#Fi!}SJH*(@GB6yG6`1bN&cIN}e&p$8Mh1sF
jjD<f-2BY*5#vi;{|1OpsZSgDsx}U+*)z4*}Q$iB}E&aEi

diff --git a/src/minecraft/assemblyline/client/model/ModelRejectorPiston.java b/src/minecraft/assemblyline/client/model/ModelRejectorPiston.java
new file mode 100644
index 00000000..bc0381af
--- /dev/null
+++ b/src/minecraft/assemblyline/client/model/ModelRejectorPiston.java
@@ -0,0 +1,170 @@
+// Date: 1/17/2013 8:14:56 PM
+// Template version 1.1
+// Java generated by Techne
+// Keep in mind that you still need to fill in some blanks
+// - ZeuX
+
+package assemblyline.client.model;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelRejectorPiston extends ModelBase
+{
+    // fields
+    ModelRenderer BodyBottom;
+    ModelRenderer PistonFace2;
+    ModelRenderer PistonShaft;
+    ModelRenderer Piston;
+    ModelRenderer H1;
+    ModelRenderer H2;
+    ModelRenderer H3;
+    ModelRenderer PistonFace;
+    ModelRenderer WireCCRight;
+    ModelRenderer WireCCLeft;
+    ModelRenderer BodyP2;
+    ModelRenderer BodyP1;
+    ModelRenderer LeftSide;
+    ModelRenderer RightSide;
+    ModelRenderer PistonBack;
+    ModelRenderer WireCCFront;
+
+    public ModelRejectorPiston()
+    {
+        textureWidth = 128;
+        textureHeight = 128;
+
+        BodyBottom = new ModelRenderer(this, 29, 69);
+        BodyBottom.addBox(-5F, 0F, -2F, 10, 5, 15);
+        BodyBottom.setRotationPoint(0F, 19F, -6F);
+        BodyBottom.setTextureSize(128, 128);
+        BodyBottom.mirror = true;
+        setRotation(BodyBottom, 0F, 0F, 0F);
+        PistonFace2 = new ModelRenderer(this, 0, 53);
+        PistonFace2.addBox(-2F, -2F, -1F, 4, 6, 1);
+        PistonFace2.setRotationPoint(0F, 15F, -6F);
+        PistonFace2.setTextureSize(128, 128);
+        PistonFace2.mirror = true;
+        setRotation(PistonFace2, 0F, 0F, 0F);
+        PistonShaft = new ModelRenderer(this, 0, 75);
+        PistonShaft.addBox(-1.5F, -1.5F, 0F, 3, 3, 10);
+        PistonShaft.setRotationPoint(0F, 16F, -6F);
+        PistonShaft.setTextureSize(128, 128);
+        PistonShaft.mirror = true;
+        setRotation(PistonShaft, 0F, 0F, 0F);
+        Piston = new ModelRenderer(this, 0, 22);
+        Piston.addBox(-3F, -1F, 0F, 6, 6, 10);
+        Piston.setRotationPoint(0F, 14F, -5F);
+        Piston.setTextureSize(128, 128);
+        Piston.mirror = true;
+        setRotation(Piston, 0F, 0F, 0F);
+        H1 = new ModelRenderer(this, 33, 23);
+        H1.addBox(-1.5F, 0F, 0F, 3, 1, 8);
+        H1.setRotationPoint(0F, 12F, -4F);
+        H1.setTextureSize(128, 128);
+        H1.mirror = true;
+        setRotation(H1, 0F, 0F, 0F);
+        H2 = new ModelRenderer(this, 90, 23);
+        H2.addBox(0F, -1.5F, 0F, 1, 3, 8);
+        H2.setRotationPoint(-4F, 16F, -4F);
+        H2.setTextureSize(128, 128);
+        H2.mirror = true;
+        setRotation(H2, 0F, 0F, 0F);
+        H3 = new ModelRenderer(this, 70, 23);
+        H3.addBox(0F, -1.5F, 0F, 1, 3, 8);
+        H3.setRotationPoint(3F, 16F, -4F);
+        H3.setTextureSize(128, 128);
+        H3.mirror = true;
+        setRotation(H3, 0F, 0F, 0F);
+        PistonFace = new ModelRenderer(this, 0, 62);
+        PistonFace.addBox(-3F, -2F, -1F, 6, 4, 1);
+        PistonFace.setRotationPoint(0F, 16F, -6F);
+        PistonFace.setTextureSize(128, 128);
+        PistonFace.mirror = true;
+        setRotation(PistonFace, 0F, 0F, 0F);
+        WireCCRight = new ModelRenderer(this, 69, 52);
+        WireCCRight.addBox(-3F, -3F, 0F, 6, 11, 1);
+        WireCCRight.setRotationPoint(0F, 16F, 7F);
+        WireCCRight.setTextureSize(128, 128);
+        WireCCRight.mirror = true;
+        setRotation(WireCCRight, 0F, 0F, 0F);
+        WireCCLeft = new ModelRenderer(this, 54, 37);
+        WireCCLeft.addBox(0F, -3F, -3F, 1, 8, 6);
+        WireCCLeft.setRotationPoint(7F, 16F, 0F);
+        WireCCLeft.setTextureSize(128, 128);
+        WireCCLeft.mirror = true;
+        setRotation(WireCCLeft, 0F, 0F, 0F);
+        BodyP2 = new ModelRenderer(this, 100, 60);
+        BodyP2.addBox(1F, -2F, -2F, 2, 7, 4);
+        BodyP2.setRotationPoint(-8F, 16F, 0F);
+        BodyP2.setTextureSize(128, 128);
+        BodyP2.mirror = true;
+        setRotation(BodyP2, 0F, 0F, 0F);
+        BodyP1 = new ModelRenderer(this, 87, 60);
+        BodyP1.addBox(3F, -2F, -2F, 2, 7, 4);
+        BodyP1.setRotationPoint(2F, 16F, 0F);
+        BodyP1.setTextureSize(128, 128);
+        BodyP1.mirror = true;
+        setRotation(BodyP1, 0F, 0F, 0F);
+        LeftSide = new ModelRenderer(this, 29, 91);
+        LeftSide.addBox(0F, 0F, -2F, 3, 3, 14);
+        LeftSide.setRotationPoint(5F, 21F, -5F);
+        LeftSide.setTextureSize(128, 128);
+        LeftSide.mirror = true;
+        setRotation(LeftSide, 0F, 0F, 0F);
+        RightSide = new ModelRenderer(this, 64, 91);
+        RightSide.addBox(0F, 0F, -2F, 3, 3, 14);
+        RightSide.setRotationPoint(-8F, 21F, -5F);
+        RightSide.setTextureSize(128, 128);
+        RightSide.mirror = true;
+        setRotation(RightSide, 0F, 0F, 0F);
+        PistonBack = new ModelRenderer(this, 0, 12);
+        PistonBack.addBox(-2.5F, -2.5F, -1F, 5, 5, 2);
+        PistonBack.setRotationPoint(0F, 16F, 6F);
+        PistonBack.setTextureSize(128, 128);
+        PistonBack.mirror = true;
+        setRotation(PistonBack, 0F, 0F, 0F);
+        WireCCFront = new ModelRenderer(this, 69, 37);
+        WireCCFront.addBox(0F, -3F, -3F, 1, 8, 6);
+        WireCCFront.setRotationPoint(-8F, 16F, 0F);
+        WireCCFront.setTextureSize(128, 128);
+        WireCCFront.mirror = true;
+        setRotation(WireCCFront, 0F, 0F, 0F);
+    }
+
+    public void render(float f5)
+    {
+        BodyBottom.render(f5);
+        Piston.render(f5);
+        H1.render(f5);
+        H2.render(f5);
+        H3.render(f5);
+        WireCCRight.render(f5);
+        WireCCLeft.render(f5);
+        BodyP2.render(f5);
+        BodyP1.render(f5);
+        LeftSide.render(f5);
+        RightSide.render(f5);
+        PistonBack.render(f5);
+        WireCCFront.render(f5);
+    }
+
+    public void renderPiston(float f5, int p)
+    {
+        PistonFace2.setRotationPoint(0F, 15F, -6F-p);
+        PistonShaft.setRotationPoint(0F, 16F, -6F-p);
+        PistonFace.setRotationPoint(0F, 16F, -6F-p);
+        PistonFace2.render(f5);
+        PistonShaft.render(f5);
+        PistonFace.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/minecraft/assemblyline/client/render/RenderRejector.java b/src/minecraft/assemblyline/client/render/RenderRejector.java
index 787b58a8..b1b12f79 100644
--- a/src/minecraft/assemblyline/client/render/RenderRejector.java
+++ b/src/minecraft/assemblyline/client/render/RenderRejector.java
@@ -5,12 +5,13 @@ import net.minecraft.tileentity.TileEntity;
 import org.lwjgl.opengl.GL11;
 
 import assemblyline.client.model.ModelRejector;
+import assemblyline.client.model.ModelRejectorPiston;
 import assemblyline.common.AssemblyLine;
 import assemblyline.common.machine.TileEntityRejector;
 
 public class RenderRejector extends RenderImprintable
 {
-	private ModelRejector model = new ModelRejector();
+	private ModelRejectorPiston model = new ModelRejectorPiston();
 
 	private void renderAModelAt(TileEntityRejector tileEntity, double x, double y, double z, float f)
 	{
@@ -22,7 +23,7 @@ public class RenderRejector extends RenderImprintable
 		{
 			pos = 8;
 		}
-		bindTextureByName(AssemblyLine.TEXTURE_PATH + "sorter.png");
+		bindTextureByName(AssemblyLine.TEXTURE_PATH + "rejector.png");
 		GL11.glPushMatrix();
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
 		GL11.glScalef(1.0F, -1F, -1F);
@@ -42,7 +43,7 @@ public class RenderRejector extends RenderImprintable
 		{
 			GL11.glRotatef(270f, 0f, 1f, 0f);
 		}
-		model.renderMain(0.0625F);
+		model.render(0.0625F);
 		model.renderPiston(0.0625F, pos);
 		GL11.glPopMatrix();
 	}