From 9f48af67d2981c14491a3df98f13fcd7032148d0 Mon Sep 17 00:00:00 2001 From: Rseifert Date: Thu, 17 Jan 2013 20:12:26 -0500 Subject: [PATCH 1/3] Finished Rejector model 4th try to get this to push not sure whats happening but anyways finished the rejector model so it can be used to replace the temp one currently in use. --- models/Ejector.png | Bin 0 -> 6324 bytes models/Rejector.tcn | Bin 1040 -> 7187 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 models/Ejector.png diff --git a/models/Ejector.png b/models/Ejector.png new file mode 100644 index 0000000000000000000000000000000000000000..468311960371723f533e1a1f529d5adb97b04a6b GIT binary patch literal 6324 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 g&Ht}efB^b`HUa8Nh%kr3o|V%b^rhX delta 113 zcmbPiF@b|Oz?+#xgn@y9gJFZ0%0yl@G3hmGXWCw!WkjVndPXqwGBW8hz|~Inl{V2s YRfNzK;LXYgG?al62%~}Yd}a_20Kv2%@c;k- From c6e3320609d889941fefef204d0377cb11facded Mon Sep 17 00:00:00 2001 From: Rseifert Date: Thu, 17 Jan 2013 20:32:53 -0500 Subject: [PATCH 2/3] 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(kty5!>$Nt)`sjiN$hgnxluweYMQn!$I)fqAA z_nZC%+q50oSU=yTv6J&tjm>`Z&qjSO7`r`}990QgV3<6;fkACpnwcN!e=B>ZY-zdWnKb5&;<|2(a+10B~ zo#1tBSfp`J=FRuM#q3NvY7<|{JpA^|Oi8J3Z^hZlP}e|_!asj4{N|n7wW*^c?dqAN zMM^JY_%4_@P6_yC!`{(hVeWTWWIa=w4Y=)l0^(XeaH?^V|y*Sp=0 z;IXRIvfuh|UAVEX0k25xLEY61e;Js?7RddXW3W%^j7$&Gn*1_8zmmwV<DrWUMzV|#!0 zcFx>yFV=1h&u3>j@s@SZt^Zeem7?^Y`=wvL;`HdC*NyII2kB0BdB%D5!RJo%N3SZq z^DU;KU+&0Te(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?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_sEo5LgHRX~z3q#GmsgkS=sa`LI znHcQupXy<1Fk1SBlaXP5eySUz!_1&xEes9kw;L^HSm2{s>%?&2dGyRchJa;L>=YRu zd|rEIMQjdH#(#By)#k0Kf2TTr6>b_|;{(O8ccmrETy|AxrWAuS5 zPqY2^RSMpi$0VpE`#?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)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}wkYlceNPpO0`3hZOR`-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}mDz1+I|Wk8_&x_sEo5LgHRX~z3q#GmsgkS=sa`LI znHcQupXy<1Fk1SBlaXP5eySUz!_1&xEes9kw;L^HSm2{s>%?&2dGyRchJa;L>=YRu zd|rEIMQjdH#(#By)#k0Kf2TTr6>b_|;{(O8ccmrETy|AxrWAuS5 zPqY2^RSMpi$0VpE`#?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)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}wkYlceNPpO0`3hZOR`-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 Date: Thu, 17 Jan 2013 21:00:06 -0500 Subject: [PATCH 3/3] Changed item render for rejector Change out the item render for the rejector block. Also corrected a minor model issue with the robotic arm but nothing major changed with it. --- models/Armbot.tcn | Bin 994 -> 4532 bytes resources/assemblyline/textures/armbot.png | Bin 4007 -> 3377 bytes resources/assemblyline/textures/armbotOld.png | Bin 0 -> 4007 bytes .../client/model/ModelArmbot.java | 319 +++++++++--------- .../client/model/ModelRejector.java | 119 ------- .../client/render/BlockRenderingHandler.java | 8 +- .../client/render/RenderRejector.java | 1 - 7 files changed, 166 insertions(+), 281 deletions(-) create mode 100644 resources/assemblyline/textures/armbotOld.png delete mode 100644 src/minecraft/assemblyline/client/model/ModelRejector.java diff --git a/models/Armbot.tcn b/models/Armbot.tcn index 108a5bb4666d6d7f982254e2b41269f974812276..c7a656987e2f63e5a4307fd7dc773294759f0015 100644 GIT binary patch literal 4532 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 K#2-wTqyGZn=w6xt literal 994 zcmWIWW@Zs#U|`^25L>9@By}}ePK}v?!C8fYfs;XnAvZrIHAk-^H;0Qs0jP+9fssLi z!C{K`I_HmP8PVytv!e578;Bggum0BBrSe%?G54hIE8S6{S=&~fU6z?IGN+|8A!Sb7 zx0mU{UW&Qx>a6SeIXDaZ{_jhuv)Y%i<-kX)xPIBz8K?ah3C&LnjBE>aOH}%N^yUjagPRF%^QHK|-(9zu$^S<1 z!PlNlZyYy#`Fh~%^j*czfB%y0*ub||#cz$ur&@6z^~x;|qXPdliChkgTvYz4MA$U{ zYuKT}eWwZ}qonp%u)o`R|8(iLrMr{9e>UZO|1{=W5 zVTD}kqIBzhwqGlMo!DQYd}n6$tV%DCz@nf>i`W-yIr7MMBps%QM07pre4W;QmTS+|~bTI9r1jVo^F z+MegAS#)Hf$wJ$ip-+=o5? z>|qER5J1IvA|>Y6BWbs_8d!hU;N|HPVRWW zjS8EKOiq?Q{ra(4GQRNqEU~Ro{bycPc&A=HZ++)qkln6jKkSb3PoJI9>U?i)?q;zG z@fK<8yE1;?KE$=Ba@OM+Zr;~kWXZYiK6-KC2mSzWMkZYb+*uBs&ENz{88E<`l?{?f P85yF1j6z^eW?%pS9Vx+N diff --git a/resources/assemblyline/textures/armbot.png b/resources/assemblyline/textures/armbot.png index a1a44b2e0d7c3795459bdb4f8ba9295bb1917a29..137429370760734584a2bea264ad81460088a704 100644 GIT binary patch literal 3377 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 literal 4007 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 diff --git a/resources/assemblyline/textures/armbotOld.png b/resources/assemblyline/textures/armbotOld.png new file mode 100644 index 0000000000000000000000000000000000000000..a1a44b2e0d7c3795459bdb4f8ba9295bb1917a29 GIT binary patch literal 4007 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 literal 0 HcmV?d00001 diff --git a/src/minecraft/assemblyline/client/model/ModelArmbot.java b/src/minecraft/assemblyline/client/model/ModelArmbot.java index 592cc262..9b558a4f 100644 --- a/src/minecraft/assemblyline/client/model/ModelArmbot.java +++ b/src/minecraft/assemblyline/client/model/ModelArmbot.java @@ -8,169 +8,174 @@ import org.lwjgl.opengl.GL11; public class ModelArmbot extends ModelBase { - // fields - ModelRenderer baseTop; - ModelRenderer base; - ModelRenderer armMountRight; - ModelRenderer armMountLeft; - ModelRenderer armLower; - ModelRenderer armLower2; - ModelRenderer armLower3; - ModelRenderer armUpper; - ModelRenderer baseRotation; - ModelRenderer clampBody; - ModelRenderer clampBody2; - ModelRenderer clampClawLower; - ModelRenderer clampClawLower2; - ModelRenderer clampClawLower3; + // fields + ModelRenderer baseTop; + ModelRenderer base; + ModelRenderer armMountRight; + ModelRenderer armMountLeft; + ModelRenderer armLower; + ModelRenderer armLower2; + ModelRenderer armLower3; + ModelRenderer armUpper; + ModelRenderer baseRotation; + ModelRenderer clampBody; + ModelRenderer clampBody2; + ModelRenderer clampClawLower; + ModelRenderer clampClawLower2; + ModelRenderer clampClawLower3; - public ModelArmbot() - { - textureWidth = 128; - textureHeight = 128; + public ModelArmbot() + { + textureWidth = 128; + textureHeight = 128; - baseTop = new ModelRenderer(this, 0, 94); - baseTop.addBox(-6F, 0F, -6F, 12, 3, 12); - baseTop.setRotationPoint(0F, 18F, 0F); - baseTop.setTextureSize(64, 32); - baseTop.mirror = true; - setRotation(baseTop, 0F, 0F, 0F); - base = new ModelRenderer(this, 0, 109); - base.addBox(-8F, 0F, -8F, 16, 3, 16); - base.setRotationPoint(0F, 21F, 0F); - base.setTextureSize(64, 32); - base.mirror = true; - setRotation(base, 0F, 0F, 0F); - armMountRight = new ModelRenderer(this, 12, 85); - armMountRight.addBox(-4F, -5F, -2F, 2, 5, 4); - armMountRight.setRotationPoint(0F, 17F, 0F); - armMountRight.setTextureSize(64, 32); - armMountRight.mirror = true; - setRotation(armMountRight, 0F, 0F, 0F); - armMountLeft = new ModelRenderer(this, 0, 85); - armMountLeft.addBox(2F, -5F, -2F, 2, 5, 4); - armMountLeft.setRotationPoint(0F, 17F, 0F); - armMountLeft.setTextureSize(64, 32); - armMountLeft.mirror = true; - setRotation(armMountLeft, 0F, 0F, 0F); - armLower = new ModelRenderer(this, 116, 0); - armLower.addBox(0.3F, -15F, -1.5F, 2, 16, 4); - armLower.setRotationPoint(0F, 14F, 0F); - armLower.setTextureSize(64, 32); - armLower.mirror = true; - setRotation(armLower, 0.5235988F, 0F, 0F); - armLower2 = new ModelRenderer(this, 104, 0); - armLower2.addBox(-2.3F, -15F, -1.5F, 2, 16, 4); - armLower2.setRotationPoint(0F, 14F, 0F); - armLower2.setTextureSize(64, 32); - armLower2.mirror = true; - setRotation(armLower2, 0.5235988F, 0F, 0F); - armLower3 = new ModelRenderer(this, 92, 0); - armLower3.addBox(-1F, -14F, -2F, 2, 14, 4); - armLower3.setRotationPoint(0F, 14F, 0F); - armLower3.setTextureSize(64, 32); - armLower3.mirror = true; - setRotation(armLower3, 0.5235988F, 0F, 0F); - armUpper = new ModelRenderer(this, 0, 70); - armUpper.addBox(-1F, -10F, -1.5F, 2, 12, 3); - armUpper.setRotationPoint(0F, 2F, -7F); - armUpper.setTextureSize(64, 32); - armUpper.mirror = true; - setRotation(armUpper, 2.513274F, 0F, 0F); - baseRotation = new ModelRenderer(this, 0, 60); - baseRotation.addBox(-4.5F, 0F, -4.5F, 9, 1, 9); - baseRotation.setRotationPoint(0F, 17F, 0F); - baseRotation.setTextureSize(64, 32); - baseRotation.mirror = true; - setRotation(baseRotation, 0F, 0F, 0F); - clampBody = new ModelRenderer(this, 0, 7); - clampBody.addBox(-1.5F, -12F, -2.5F, 3, 2, 5); - clampBody.setRotationPoint(0F, 2F, -7F); - clampBody.setTextureSize(64, 32); - clampBody.mirror = true; - setRotation(clampBody, 2.513274F, 0F, 0F); - clampBody2 = new ModelRenderer(this, 0, 56); - clampBody2.addBox(-1F, -14F, -1F, 2, 2, 2); - clampBody2.setRotationPoint(0F, 2F, -7F); - clampBody2.setTextureSize(64, 32); - clampBody2.mirror = true; - setRotation(clampBody2, 2.513274F, 0F, 0F); - clampClawLower = new ModelRenderer(this, 0, 25); - clampClawLower.addBox(-1F, -4F, -1F, 2, 5, 1); - clampClawLower.setRotationPoint(0F, 13F, -15F); - clampClawLower.setTextureSize(64, 32); - clampClawLower.mirror = true; - setRotation(clampClawLower, 2.9147F, 0F, 0F); - clampClawLower2 = new ModelRenderer(this, 0, 31); - clampClawLower2.addBox(-1.2F, -3.5F, 0F, 1, 6, 1); - clampClawLower2.setRotationPoint(0F, 14F, -16F); - clampClawLower2.setTextureSize(64, 32); - clampClawLower2.mirror = true; - setRotation(clampClawLower2, 2.897247F, 0F, 0F); - clampClawLower3 = new ModelRenderer(this, 0, 0); - clampClawLower3.addBox(0.2F, -3.5F, 0F, 1, 6, 1); - clampClawLower3.setRotationPoint(0F, 14F, -16F); - clampClawLower3.setTextureSize(64, 32); - clampClawLower3.mirror = true; - setRotation(clampClawLower3, 2.897247F, 0F, 0F); - } + baseTop = new ModelRenderer(this, 0, 94); + baseTop.addBox(-6F, 0F, -6F, 12, 3, 12); + baseTop.setRotationPoint(0F, 18F, 0F); + baseTop.setTextureSize(64, 32); + baseTop.mirror = true; + setRotation(baseTop, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 109); + base.addBox(-8F, 0F, -8F, 16, 3, 16); + base.setRotationPoint(0F, 21F, 0F); + base.setTextureSize(64, 32); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + armMountRight = new ModelRenderer(this, 24, 85); + armMountRight.addBox(-3.8F, -5F, -2F, 4, 5, 4); + armMountRight.setRotationPoint(0F, 17F, 0F); + armMountRight.setTextureSize(128, 128); + armMountRight.mirror = true; + setRotation(armMountRight, 0F, 0F, 0F); + armMountLeft = new ModelRenderer(this, 0, 85); + armMountLeft.addBox(2F, -5F, -2F, 2, 5, 4); + armMountLeft.setRotationPoint(0F, 17F, 0F); + armMountLeft.setTextureSize(64, 32); + armMountLeft.mirror = true; + setRotation(armMountLeft, 0F, 0F, 0F); + armLower = new ModelRenderer(this, 116, 0); + armLower.addBox(0.3F, -15F, -1.5F, 2, 16, 4); + armLower.setRotationPoint(0F, 14F, 0F); + armLower.setTextureSize(64, 32); + armLower.mirror = true; + setRotation(armLower, 0.5235988F, 0F, 0F); + armLower2 = new ModelRenderer(this, 104, 0); + armLower2.addBox(-2.3F, -15F, -1.5F, 2, 16, 4); + armLower2.setRotationPoint(0F, 14F, 0F); + armLower2.setTextureSize(64, 32); + armLower2.mirror = true; + setRotation(armLower2, 0.5235988F, 0F, 0F); + armLower3 = new ModelRenderer(this, 92, 0); + armLower3.addBox(-1F, -14F, -2F, 2, 14, 4); + armLower3.setRotationPoint(0F, 14F, 0F); + armLower3.setTextureSize(64, 32); + armLower3.mirror = true; + setRotation(armLower3, 0.5235988F, 0F, 0F); + armUpper = new ModelRenderer(this, 0, 70); + armUpper.addBox(-1F, -10F, -1.5F, 2, 12, 3); + armUpper.setRotationPoint(0F, 2F, -7F); + armUpper.setTextureSize(64, 32); + armUpper.mirror = true; + setRotation(armUpper, 2.513274F, 0F, 0F); + baseRotation = new ModelRenderer(this, 0, 60); + baseRotation.addBox(-4.5F, 0F, -4.5F, 9, 1, 9); + baseRotation.setRotationPoint(0F, 17F, 0F); + baseRotation.setTextureSize(64, 32); + baseRotation.mirror = true; + setRotation(baseRotation, 0F, 0F, 0F); + clampBody = new ModelRenderer(this, 0, 7); + clampBody.addBox(-1.5F, -12F, -2.5F, 3, 2, 5); + clampBody.setRotationPoint(0F, 2F, -7F); + clampBody.setTextureSize(64, 32); + clampBody.mirror = true; + setRotation(clampBody, 2.513274F, 0F, 0F); + clampBody2 = new ModelRenderer(this, 0, 56); + clampBody2.addBox(-1F, -14F, -1F, 2, 2, 2); + clampBody2.setRotationPoint(0F, 2F, -7F); + clampBody2.setTextureSize(64, 32); + clampBody2.mirror = true; + setRotation(clampBody2, 2.513274F, 0F, 0F); + clampClawLower = new ModelRenderer(this, 0, 25); + clampClawLower.addBox(-1F, -4F, -1F, 2, 5, 1); + clampClawLower.setRotationPoint(0F, 13F, -15F); + clampClawLower.setTextureSize(64, 32); + clampClawLower.mirror = true; + setRotation(clampClawLower, 2.9147F, 0F, 0F); + clampClawLower2 = new ModelRenderer(this, 0, 31); + clampClawLower2.addBox(-1.2F, -3.5F, 0F, 1, 6, 1); + clampClawLower2.setRotationPoint(0F, 14F, -16F); + clampClawLower2.setTextureSize(64, 32); + clampClawLower2.mirror = true; + setRotation(clampClawLower2, 2.897247F, 0F, 0F); + clampClawLower3 = new ModelRenderer(this, 0, 0); + clampClawLower3.addBox(0.2F, -3.5F, 0F, 1, 6, 1); + clampClawLower3.setRotationPoint(0F, 14F, -16F); + clampClawLower3.setTextureSize(64, 32); + clampClawLower3.mirror = true; + setRotation(clampClawLower3, 2.897247F, 0F, 0F); + } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - super.render(entity, f, f1, f2, f3, f4, f5); - this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - this.render(f5, entity.rotationYaw, entity.rotationPitch); - } + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + this.render(f5, entity.rotationYaw, entity.rotationPitch); + } - public void render(float f5, float rotationYaw, float rotationPitch) - { + public void render(float f5, float rotationYaw, float rotationPitch) + { - /* - * armMountRight.setRotationPoint(baseRotation.rotationPointX, armMountRight.rotationPointY, - * baseRotation.rotationPointX); armMountLeft.setRotationPoint(baseRotation.rotationPointX, - * armMountLeft.rotationPointY, baseRotation.rotationPointX); - * armLower.setRotationPoint(baseRotation.rotationPointX, armLower.rotationPointY, - * baseRotation.rotationPointX); armUpper.setRotationPoint(baseRotation.rotationPointX, - * armUpper.rotationPointY, baseRotation.rotationPointX); - * baseRotation.setRotationPoint(baseRotation.rotationPointX, baseRotation.rotationPointY, - * baseRotation.rotationPointX); clampBody.setRotationPoint(baseRotation.rotationPointX, - * clampBody.rotationPointY, baseRotation.rotationPointX); - * clampBody2.setRotationPoint(baseRotation.rotationPointX, clampBody2.rotationPointY, - * baseRotation.rotationPointX); - * clampClawLower.setRotationPoint(baseRotation.rotationPointX, - * clampClawLower.rotationPointY, baseRotation.rotationPointX); - * clampClawLower2.setRotationPoint(baseRotation.rotationPointX, - * clampClawLower2.rotationPointY, baseRotation.rotationPointX); - * - * armMountRight.rotateAngleY = armBot.rotationYaw; armMountLeft.rotateAngleY = - * armBot.rotationYaw; armLower.rotateAngleY = armBot.rotationYaw; armUpper.rotateAngleY = - * armBot.rotationYaw; baseRotation.rotateAngleY = armBot.rotationYaw; - * clampBody.rotateAngleY = armBot.rotationYaw; clampBody2.rotateAngleY = - * armBot.rotationYaw; clampClawLower.rotateAngleY = armBot.rotationYaw; - * clampClawLower2.rotateAngleY = armBot.rotationYaw; - */ + /* + * armMountRight.setRotationPoint(baseRotation.rotationPointX, + * armMountRight.rotationPointY, baseRotation.rotationPointX); + * armMountLeft.setRotationPoint(baseRotation.rotationPointX, + * armMountLeft.rotationPointY, baseRotation.rotationPointX); + * armLower.setRotationPoint(baseRotation.rotationPointX, + * armLower.rotationPointY, baseRotation.rotationPointX); + * armUpper.setRotationPoint(baseRotation.rotationPointX, + * armUpper.rotationPointY, baseRotation.rotationPointX); + * baseRotation.setRotationPoint(baseRotation.rotationPointX, + * baseRotation.rotationPointY, baseRotation.rotationPointX); + * clampBody.setRotationPoint(baseRotation.rotationPointX, + * clampBody.rotationPointY, baseRotation.rotationPointX); + * clampBody2.setRotationPoint(baseRotation.rotationPointX, + * clampBody2.rotationPointY, baseRotation.rotationPointX); + * clampClawLower.setRotationPoint(baseRotation.rotationPointX, + * clampClawLower.rotationPointY, baseRotation.rotationPointX); + * clampClawLower2.setRotationPoint(baseRotation.rotationPointX, + * clampClawLower2.rotationPointY, baseRotation.rotationPointX); + * + * armMountRight.rotateAngleY = armBot.rotationYaw; + * armMountLeft.rotateAngleY = armBot.rotationYaw; armLower.rotateAngleY + * = armBot.rotationYaw; armUpper.rotateAngleY = armBot.rotationYaw; + * baseRotation.rotateAngleY = armBot.rotationYaw; + * clampBody.rotateAngleY = armBot.rotationYaw; clampBody2.rotateAngleY + * = armBot.rotationYaw; clampClawLower.rotateAngleY = + * armBot.rotationYaw; clampClawLower2.rotateAngleY = + * armBot.rotationYaw; + */ - baseTop.render(f5); - base.render(f5); - GL11.glPushMatrix(); - GL11.glRotatef(rotationYaw, 0, 1, 0); - armMountRight.render(f5); - armMountLeft.render(f5); - armLower.render(f5); - armUpper.render(f5); - baseRotation.render(f5); - clampBody.render(f5); - clampBody2.render(f5); - clampClawLower.render(f5); - clampClawLower2.render(f5); - GL11.glPopMatrix(); + baseTop.render(f5); + base.render(f5); + GL11.glPushMatrix(); + GL11.glRotatef(rotationYaw, 0, 1, 0); + armMountRight.render(f5); + armMountLeft.render(f5); + armLower.render(f5); + armUpper.render(f5); + baseRotation.render(f5); + clampBody.render(f5); + clampBody2.render(f5); + clampClawLower.render(f5); + clampClawLower2.render(f5); + GL11.glPopMatrix(); - } + } - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } + 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/model/ModelRejector.java b/src/minecraft/assemblyline/client/model/ModelRejector.java deleted file mode 100644 index b4de6552..00000000 --- a/src/minecraft/assemblyline/client/model/ModelRejector.java +++ /dev/null @@ -1,119 +0,0 @@ -// Date: 9/8/2012 7:10:46 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; - -public class ModelRejector extends ModelBase -{ - // fields - ModelRenderer Base; - ModelRenderer Case; - ModelRenderer Piston; - ModelRenderer H1; - ModelRenderer H2; - ModelRenderer Top; - ModelRenderer Case2; - ModelRenderer H3; - ModelRenderer PistonShaft; - ModelRenderer PistonFace; - - public ModelRejector() - { - textureWidth = 128; - textureHeight = 128; - - Base = new ModelRenderer(this, 64, 0); - Base.addBox(-8F, 0F, -8F, 16, 4, 16); - Base.setRotationPoint(0F, 20F, 0F); - Base.setTextureSize(64, 32); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Case = new ModelRenderer(this, 0, 38); - Case.addBox(-2F, 0F, 0F, 4, 8, 13); - Case.setRotationPoint(-5F, 12F, -6F); - Case.setTextureSize(64, 32); - Case.mirror = true; - setRotation(Case, 0F, 0F, 0F); - Piston = new ModelRenderer(this, 0, 22); - Piston.addBox(-2F, 0F, 0F, 4, 4, 10); - Piston.setRotationPoint(0F, 15F, -5F); - Piston.setTextureSize(64, 32); - Piston.mirror = true; - setRotation(Piston, 0F, 0F, 0F); - H1 = new ModelRenderer(this, 29, 23); - H1.addBox(-2F, 0F, 0F, 2, 1, 8); - H1.setRotationPoint(1F, 19F, -4F); - H1.setTextureSize(64, 32); - H1.mirror = true; - setRotation(H1, 0F, 0F, 0F); - H2 = new ModelRenderer(this, 54, 23); - H2.addBox(-2F, 0F, 0F, 1, 2, 8); - H2.setRotationPoint(-1F, 16F, -4F); - H2.setTextureSize(64, 32); - H2.mirror = true; - setRotation(H2, 0F, 0F, 0F); - Top = new ModelRenderer(this, 0, 0); - Top.addBox(-8F, 0F, -8F, 16, 4, 16); - Top.setRotationPoint(0F, 8F, 0F); - Top.setTextureSize(64, 32); - Top.mirror = true; - setRotation(Top, 0F, 0F, 0F); - Case2 = new ModelRenderer(this, 0, 38); - Case2.addBox(-2F, 0F, 0F, 4, 8, 13); - Case2.setRotationPoint(5F, 12F, -6F); - Case2.setTextureSize(64, 32); - Case2.mirror = true; - setRotation(Case2, 0F, 0F, 0F); - H3 = new ModelRenderer(this, 54, 23); - H3.addBox(-2F, 0F, 0F, 1, 2, 8); - H3.setRotationPoint(4F, 16F, -4F); - H3.setTextureSize(64, 32); - H3.mirror = true; - setRotation(H3, 0F, 0F, 0F); - PistonShaft = new ModelRenderer(this, 0, 67); - PistonShaft.addBox(-1F, -1F, 0F, 2, 2, 10); - PistonShaft.setRotationPoint(0F, 17F, -6F); - PistonShaft.setTextureSize(64, 32); - PistonShaft.mirror = true; - setRotation(PistonShaft, 0F, 0F, 0F); - PistonFace = new ModelRenderer(this, 0, 62); - PistonFace.addBox(-3F, -1F, -1F, 6, 2, 1); - PistonFace.setRotationPoint(0F, 17F, -6F); - PistonFace.setTextureSize(64, 32); - PistonFace.mirror = true; - setRotation(PistonFace, 0F, 0F, 0F); - } - - public void renderMain(float f5) - { - Base.render(f5); - Case.render(f5); - H1.render(f5); - H2.render(f5); - Top.render(f5); - Case2.render(f5); - H3.render(f5); - } - - public void renderPiston(float f5, int pos) - { - Piston.render(f5); - PistonShaft.setRotationPoint(0F, 17F, -6F - pos); - PistonFace.setRotationPoint(0F, 17F, -6F - pos); - 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/BlockRenderingHandler.java b/src/minecraft/assemblyline/client/render/BlockRenderingHandler.java index 5ee50699..6a3ba0eb 100644 --- a/src/minecraft/assemblyline/client/render/BlockRenderingHandler.java +++ b/src/minecraft/assemblyline/client/render/BlockRenderingHandler.java @@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11; import universalelectricity.core.vector.Vector3; import assemblyline.client.model.ModelConveyorBelt; import assemblyline.client.model.ModelManipulator; -import assemblyline.client.model.ModelRejector; +import assemblyline.client.model.ModelRejectorPiston; import assemblyline.common.AssemblyLine; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -23,7 +23,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler public static BlockRenderingHandler instance = new BlockRenderingHandler(); public static final int BLOCK_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); private ModelConveyorBelt modelConveyorBelt = new ModelConveyorBelt(); - private ModelRejector modelEjector = new ModelRejector(); + private ModelRejectorPiston modelEjector = new ModelRejectorPiston(); private ModelManipulator modelInjector = new ModelManipulator(); @Override @@ -44,12 +44,12 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler } else if (block.blockID == AssemblyLine.blockRejector.blockID) { - GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(AssemblyLine.TEXTURE_PATH + "sorter.png")); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(AssemblyLine.TEXTURE_PATH + "rejector.png")); GL11.glPushMatrix(); GL11.glTranslatef((float) 0.6F, (float) 1.5F, (float) 0.6F); GL11.glRotatef(180f, 0f, 0f, 1f); GL11.glRotatef(-90f, 0f, 1f, 0f); - modelEjector.renderMain(0.0625F); + modelEjector.render(0.0625F); modelEjector.renderPiston(0.0625F, 1); GL11.glPopMatrix(); } diff --git a/src/minecraft/assemblyline/client/render/RenderRejector.java b/src/minecraft/assemblyline/client/render/RenderRejector.java index b1b12f79..dbbe7c03 100644 --- a/src/minecraft/assemblyline/client/render/RenderRejector.java +++ b/src/minecraft/assemblyline/client/render/RenderRejector.java @@ -4,7 +4,6 @@ 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;