From 097e46a43ec4cc228773d8aabd59730b841871f8 Mon Sep 17 00:00:00 2001 From: Robert Seifert Date: Mon, 3 Jun 2013 07:09:55 -0400 Subject: [PATCH] Working on new tank render --- build.properties | 4 +- .../TankCorner2.tcn | Bin .../TankSingle2.tcn | Bin models/Current_Models/Tank.tcn | Bin 0 -> 1938 bytes .../fluidmech/textures/models/TankSide.png | Bin 0 -> 2149 bytes .../textures/models/tanks/Corner.png | Bin 1058 -> 0 bytes .../textures/models/tanks/CornerLava.png | Bin 1067 -> 0 bytes .../textures/models/tanks/CornerMilk.png | Bin 4101 -> 0 bytes .../textures/models/tanks/CornerWater.png | Bin 1063 -> 0 bytes .../textures/models/tanks/LavaTank.png | Bin 1067 -> 0 bytes .../textures/models/tanks/MilkTank.png | Bin 3152 -> 0 bytes .../textures/models/tanks/SteamTank.png | Bin 1067 -> 0 bytes .../fluidmech/textures/models/tanks/Tank.png | Bin 942 -> 0 bytes .../fluidmech/textures/models/tanks/Tank2.png | Bin 1053 -> 0 bytes .../textures/models/tanks/WaterTank.png | Bin 491 -> 0 bytes .../textures/models/tanks/guage/0.png | Bin 742 -> 0 bytes .../textures/models/tanks/guage/0Fuel.png | Bin 742 -> 0 bytes .../textures/models/tanks/guage/0Lava.png | Bin 742 -> 0 bytes .../textures/models/tanks/guage/1.png | Bin 770 -> 0 bytes .../textures/models/tanks/guage/1Fuel.png | Bin 974 -> 0 bytes .../textures/models/tanks/guage/1Lava.png | Bin 990 -> 0 bytes .../textures/models/tanks/guage/2.png | Bin 967 -> 0 bytes .../textures/models/tanks/guage/2Fuel.png | Bin 974 -> 0 bytes .../textures/models/tanks/guage/2Lava.png | Bin 1003 -> 0 bytes .../textures/models/tanks/guage/3.png | Bin 790 -> 0 bytes .../textures/models/tanks/guage/3Fuel.png | Bin 975 -> 0 bytes .../textures/models/tanks/guage/3Lava.png | Bin 1003 -> 0 bytes .../textures/models/tanks/guage/4.png | Bin 740 -> 0 bytes .../textures/models/tanks/guage/4Fuel.png | Bin 762 -> 0 bytes .../textures/models/tanks/guage/4Lava.png | Bin 810 -> 0 bytes .../dark/fluid/client/ClientProxy.java | 8 +- .../fluid/client/model/ModelTankSide.java | 179 +++++++++++++++++ .../client/render/BlockRenderHelper.java | 9 +- .../dark/fluid/client/render/RenderTank.java | 181 +++++------------- 34 files changed, 238 insertions(+), 143 deletions(-) rename models/{Current_Models => Archive}/TankCorner2.tcn (100%) rename models/{Current_Models => Archive}/TankSingle2.tcn (100%) create mode 100644 models/Current_Models/Tank.tcn create mode 100644 resources/mods/fluidmech/textures/models/TankSide.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/Corner.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/CornerLava.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/CornerMilk.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/CornerWater.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/LavaTank.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/MilkTank.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/SteamTank.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/Tank.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/Tank2.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/WaterTank.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/0.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/0Fuel.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/0Lava.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/1.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/1Fuel.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/1Lava.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/2.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/2Fuel.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/2Lava.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/3.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/3Fuel.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/3Lava.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/4.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/4Fuel.png delete mode 100644 resources/mods/fluidmech/textures/models/tanks/guage/4Lava.png create mode 100644 src/minecraft/dark/fluid/client/model/ModelTankSide.java diff --git a/build.properties b/build.properties index e319cfee..2e2d5c0f 100644 --- a/build.properties +++ b/build.properties @@ -2,5 +2,5 @@ dir.development=./ dir.mcp=${dir.development}forge/mcp version.minecraft=1.5.2 version.mod.major=0 -version.mod.minor=4 -version.mod.revis=3 +version.mod.minor=5 +version.mod.revis=1 diff --git a/models/Current_Models/TankCorner2.tcn b/models/Archive/TankCorner2.tcn similarity index 100% rename from models/Current_Models/TankCorner2.tcn rename to models/Archive/TankCorner2.tcn diff --git a/models/Current_Models/TankSingle2.tcn b/models/Archive/TankSingle2.tcn similarity index 100% rename from models/Current_Models/TankSingle2.tcn rename to models/Archive/TankSingle2.tcn diff --git a/models/Current_Models/Tank.tcn b/models/Current_Models/Tank.tcn new file mode 100644 index 0000000000000000000000000000000000000000..d72fc2f792f3fe10506e7f8ff02943b31d456a9b GIT binary patch literal 1938 zcmb7_YcSi18pi)9btzrPrMjdjb&hpCR8UT=cD8j{x24jpODJiEgv2#fOZH5+(N+i% zvL!;RrFDxti4{dlt0i`;Dk2wDQ$pgdisU$ZW_Hf$%=xhM&b-gOGw(c~e)BwmzDkF5 z0RT`16r2XmZp(FZsEPpKXaN9ffH{zWj)kLauO*<=0h5C#08ju7fa~5ft>>dg6+YMH zQYmuQ-e5>zJS`9W#BA)S2{qMt^CqH4jVokEm z2-D1VjdR*9=A!!yhw#?eYd&UP8sGE7^m7obXiTD@KeU*=hKjQ)9?SDqpjcX}TO-L9 z$pUJzG_sbFa<%SjANj#f>r7Sl7uf5$CLgTb6+yj*H-nr{dX8J*LNP;)P2 zLVeE|Dq)F4Bc85~Y8+=sM`%SV3FfYV9??mNRT#9tJfrfi1tBPua*>8#v(48Kb~$43 z{>F@9l$Ru~a9s4T#jy79uwg5dqxr@c3eUAr6 za2ozP5ggH`SzZ*SLA?i_7#xoU=hg3Ihegkwwxa~yxQkZ~ft_CuxbZEx>aYXD)tE`yHlpMO$N zZCTTvZdb`i8jNi`XxmDz9-SN+436=Coi>)e=$eUsAf{#!%Q(1rUsQ!Am@T)OEZCL! zXfyp0rrrvf`OvK{=emy#QJR8&eMU>j&c%wwzYLFQ3*t@Mqs^fFBvQ#&(v>q4_DsYI z`N`H*zmgxHxlj0=s_Zp=hfWjcGtb_4@^er6i?j!lJMOHE6L+hP(C|IK4%scR!; zPPHr+t8oyTe(J$P8*Vd}zQij{=uY=8*K}Fl$Xb|cM-#zK%Oc4&iM$zK*AdoZDc(rNdz1WirX9LKcMen(ZOC%FQe1as~3RHdfQh%0+UQZbki3|%3r@CV$)3`JN&d6;7Tv1UW-x?ws zio)cw{Y-AP-&t&V2c#{oNf>kHtI4Q7bD>sRhr_uU4@3NdjU7Y6B3NNx1_XFC;;@5+ zn47l`?;D@ruLl*>f=wtGb`eV>AR z7uWR|e?NISYk$N55*_p*#^vN>Qx)GQq#BQ)mEwB#?lpew%ChyasY!p68RTs?t&}Qax2KpQs?97!zDw;x%|{t zOUQcF&9qJWON$e-x_n1W3RjG=cI&xxtE_wTyXNgBIK>*}2kV8R9n|*4ABClptHpOC zVN#kO!D;JN%@58 zf`Uu-Y z#&L|c1&yIvamTX8vg$U3QesiFt>QPIm0C?7w|K=AQT5 zckVgoInQ}&&*5WUhkL*Q0I%a>PbUE20GSTpfHSnD72PI5i*wf5nA2d_ez%J|S&-+o zf>syc$M#aUSfhnDx-~opf7qiHaXB~I?4~bW2waN)X>lH_d0dWlf zC`+4p{&r*RTBZkm@P6JMk1P+xS3Xbg=Pch}MH&&uE(8@%(Fgf*WPRHpRc zFqCCb(;tin4E*fY-f^hs@{W1oQw1_dkV1lmrOo`MS3KP#%asq%>BABU#qe~-McPS_5UEH0!cNM{Kplg(cXs+N7GVMd1K&FYf4;IZR^wH9t4P!eJ+y7p zVl^Ui#BBafehu$37~@52Oz3Kac~uY?Dw`=EqHVFS#cT$CHiC&9&SA zjS{8dp|2_@*kf`q3)K{NWJbc$e5=Sm%T2&BKZuWKzrWl_0W-TUV8=jhar_O4vNvZR zcximM=~k(ARaI_li<#Y@!qu^KI-PkjGxIR+1Qz?HW;Ujtr4c=AJIh1|1o+}|1+(g0VTm;KZ4HL6r9 zw7mK9#_<6J?)yNA{nn=|soOD|p&nAYU1&CSi9A*?Ya zy0qZnU?%EvzvXXWPzoOmoQRn6Z;DH;aroqvw^%I3lo@lZR%?-M#{warU0E49!`U)U z5wb}n9~zBjfq)f0bZU&_{=K{V5}Ax{4#;?DG#aNZ*V6lnFO`;JIyyQOZMzTzJ~&c# zHVf6;Z~gk0NM{4YPx1vRT{Ei~>hd|0PT7*gYswXT0a32DwzivVGa9L`o}r&fkmcy1 ztmD}eZBp@;ss%+P679?z8HqLN)f}h+K`l}{K-%JP7Z;c3I^9DVFPXAD`B(JOql*pU zx{(ld1q&rw?dgNc{N8Zg9vl>`ZeadPzLzZAV=#78Q$zOC3`4&aD&Ne^%ga+7oM^=? zTz_k_%i;FSssj0@msd#mI5#&pJwr_w z6&#A}+ z_fd{Up3RA8t_8VL&w=Ub=@VgLUsS^oq`bVNQc@t)5c$WR%k2~ZLm)p8q{K6C+_-VE zu<$s9p1ZrdWwdY*1KJNJ0S?VXEY{98RaI4`sqxG&hpSvu9H3d|3WXst4W6SlP%)6wL`O#xGcqRd3k(W~^4*sSkx-WV{Fu*GrA<^?B@j30zNn1sSqy}l7Qq$)vZAE?r^JFyLs*v9D{f8sSUoP3bz~Gd} zY;*MmLTmW$MEAZ*Ua6zsuM~2RSni?eULD=D#ZaF~?o$T4WbXf8@_vOPUlD;jA5L~c#`DCC7dx@v7EBjqW7Je13 zQ{o}U3=GVZJY5_^D&pSG4a`$=6mU*F&$Ru)w*qdy&7DfQOB8ZnaONGKSNA6^=;=23 zt7kJ+kJ+?Dybv%MGS^)mvU`x2ZM!p8NmBkNutxu6=yP zlBLkjd11mOmtF>gi+9>CF;JB~|2*@DFK1k)H+vg1HXSbXu%73)Jb%A@LhJG*8Mo!% z5}1~#C0}A?P+J^)o53N=NG+Bj!N_VWF9T)5&i4h9E;-GPFKFQWz`aa;>z_Fc+i&YS zU4L5Cd0}H0huQ%x&;RLjkH7vZ^>enP4-@}PABO((8)F$1%%u7a7(V=vxy{OuwD=>Hm-T-`LA8Sxi+vgj*Oyg3 zy})wg>8Z#o?aV$6M}cXLA>vNs(dqkN@=W-Y*$}+1FKQdZ-04%N0yUnpo`3##)v*~2 zRsO5B_|7el%D6yVe`gfKgy>tL0t~x8Otm; diff --git a/resources/mods/fluidmech/textures/models/tanks/CornerLava.png b/resources/mods/fluidmech/textures/models/tanks/CornerLava.png deleted file mode 100644 index bf37b4edf8980f6093d2915689a5c544179e1271..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 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 diff --git a/resources/mods/fluidmech/textures/models/tanks/LavaTank.png b/resources/mods/fluidmech/textures/models/tanks/LavaTank.png deleted file mode 100644 index eee54337c2ee69359273f367d735428fd9041f43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5n0T@z;^_M8K-LVNdpDhOFVsD+3zy4i3@P=V_Pf8z`(r2)5S5Q;?~={zJ7-sBpMz{ zI(Komv=nm`N!+RA>3`zK|M#k`@569_uk&%<#G-$UHsuUH5JfuM**Cm;&B&m}-~jR^3xfce3;_mjsGV@jQ5kP` zTstrASN*niet~6e>?`i+wR2;)zd6qdwb@AU_+6#7k7F#q7yrwB%ef}I|LKd2Egv5H z`(OXJ%aDqd?_RFhH z?!2#JV#v@Cj3v2XbB+V0sf$7bFtwB5%2yxx+{32UO!D2kl>rDmUHx3vIVCg!0H)ju AK>z>% diff --git a/resources/mods/fluidmech/textures/models/tanks/MilkTank.png b/resources/mods/fluidmech/textures/models/tanks/MilkTank.png deleted file mode 100644 index e617ef3ee05e2eab3f44e966d3b1547bd47ec180..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3152 zcmeH}`%_bA8pq#raxe)|6AU6&g|vcL0g=VZMMHuG16pocCtMXhXU?4Sedf&b z{XXx!b3X5dh%m+q>kq5}04qX*1NQ>}p|23YEkhryQ`HIY)#?3=-Jnjoehd{zVnApB z01br%(_t%A-`N~b6vR(EiQ}S#|Q+L_g7{6tt)5+n;H@tgq1@G(QR8- zC-wpW1W8C>z~>oplk$dqr=x4J%C(qiyWXkYFFvtB0wOkg1?1)*+-`fx)&hI%@Y>$j z*V7ev`BPudsOAU~^0dq9QR`>Xc309mgdb!Y6Xqw!ew<=IkCjOpyuH|iv6`85OTzf@ zi?M&K@le!F>E;%6DsHXV(tj(wV$?!mkSNJlB`yVizXTw-dn6KYe_V}+yYV=IYGi#- z<#_@4(sNHJ$tR2s)~nxbhTRc_p6_`qN0I`=N*`~A&6giiK+MHRGEzV$f$nDCZ|DRF z>Wjbl9VNL`0DPpqkw^@VMa!K1EzV-6>~EP%!frkBQC(svEXG6)++(>4&s!mq&dM+b zClrP`p#!JxAa-_5VvPn9)g&IUp^$8~8|WnVQTQkXT`m_GkQ^AMd@b58ye9y`;dCAx z070ZK=6CcMI=Jal=`XAl0NiWWP>MSR^phhh=n-^)=&o(LY)1lP`08-VW(vqz*h>y3 z-~_YCuP!885(vnu!r!z)=$Y_18E1_XP{jR6KWamT^mqiV|1a9JIx-d;xi);$TVkDg z>1m#~W2W&yh1j6&urwQbVv`hYG=FpZ89uk~6HR%dAIDENqn5FKHD)}ctRcOnpi7rG zcb4>35VG}irBnmVbF#vd6(&_nH#yz%BqNxn3fZ;$h@T?0+-A#x%8N5$j*k2(aaAGh zCgV7+Hd-kK3!UoGmPKnS^(^Du08?Y!u~X_*mgJ{S9ZivrwW(xSqC?ii?3hY3EYc&- zoU{$G0!Nmv4!MVI zgoM>i*_Jg5zNb2l+rkVRoe6(HHa;M#mgGxcIU7oMc2~_sy^G6J;g<_bVg=3fFUfC5 zW_oeU0pPb#1|euM|v~t+fIhZ*HDG1OQZ4f;9?P+KMA>=jVzNMl+S3) zZI4PTT7Nt8L-7pWtp%Gb{(Bs=YP`I|U}|YeyMKID)8a}FOKV=axNvOysCl-Sf2e(C zP^K_hh9VV9tp=m%h>~@6+;yzV{ASdgMwE$oV|Tp^j5M83&peG^!|N@(rSkZc(?As* zc;HnYtl??rOI&2LS8@j)^!#8-Ko-zjV_S{^@mqMAIzH+K)t>h>)YP3dmS*r$@}PRQYW%X&$Tk9bk< zF={Hw(J7i%*z*etLmg=c<<8RBrFOo4(YfxSFK)z{LsWJZ61c!+S-K$_o&yQGLF_Q5 z`cm!B_#uqXIbK>Jn`d5LT-~+DY62=ftR19g>leLPH&(4%U5`zE{csrL<5@o-TUC$U zmM`)ja-g3$5)>wJkgT1!%{7hBBsK*)@7RKxEI;>qzKU0?t_@WSr~)!^)IoAVSeAVq z713GxhjZZAM%Pnl0x5?rS1~JSkDRwOL_%DUXrJ}(Au_acAZ+=>>|JC6>Un*7n=p+q zgo&Crv8cj-P2l^jqy0K){aZ={_vIq69{gN*ljQ;voqA=q~~ZwcAjM_ExbdlfBDF{urraw`IlNP=5>xc;~+#!~1RMu$WUX z<%#2;M)9A&{6Z8C+;p2$3igqs+`#qhG-b2sT`Q3~pS7>uPg_L=ELo$K9YN4)Z_!Sj z5s7sJ?4;PJd1Pyp@(q;yu-!51=T((7O$hHkJ{RRm2Ka>>jPmBD_$AVb+Ux>v@lI&{KVn~M`YGVi(w!S^Yp{oY z`Zgx+jXu9P$$jU5Ed*ByVg*G%!!Qr^R=gO$NJlg8{fK~@T}=YK#M@rz2VnCBH%cFq z4ra^lNO4zTxYFrw0y-OI{h3C;jS=V&e>C`G4gNp(fdw0br`-5cZBPt)yaypcVS#nK HIXV9X(nkwB diff --git a/resources/mods/fluidmech/textures/models/tanks/SteamTank.png b/resources/mods/fluidmech/textures/models/tanks/SteamTank.png deleted file mode 100644 index ec9c7b849e20009026418b2b8dc7dc24370d6bfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1067 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqWR$(KN zMuvyq7#Nsmd%8G=RK&fV>zgO+DAHoPM)pP_-#P~E9ZX4_>bZ@FpB~El7J6XgG7gF3MVro9#4x@3k!Ad9?Q{ldR-cff29^nLKI^kF z{Fn3MVsO}We!m36pK1+F28NS%|C1O#ykEG4fkEZ>pKitj``afmF;GeIqu2SY_xDIw zy!-uUX*tjITZe5~miE0oKAB-x`!(e|mFX9LtXcE-%>I`TCaFYBibzlQS96Y!nG<>F1%i1vQ$UC8gz4O+wN6mVy`TUYCgUW%#J-gT& zSU6yqHKFEm`tI8OQuXi3;+X#NJAcn^=s*1U>c6^EqUGJs-^n$I`Q~T(h2Gn$jOe+q%OLj7+`v9#W{@Lc6@f-f8aOQ?uZc|2v1wYf{c^SUxUIChfTe0|k$&~dHjKb_54Fw87ryP>y znC{QS;IM=F;U`Z9299!t7&}g4Tv#JC(3=1ATXn70+_~brGSD9kp00i_>zopr0MOsF A3IG5A diff --git a/resources/mods/fluidmech/textures/models/tanks/Tank.png b/resources/mods/fluidmech/textures/models/tanks/Tank.png deleted file mode 100644 index c1e14696c73030a8e4e95ae990d35fa392ae5369..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 942 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JeOr zBZt^K85o%5JY5_^D&pSGbqqS>AmY+1-pG2V>GomW8wJ8sds7W2F0`_rxlKMaPbbaj z@4wBW0mi-D_1gBb^Tw{8+B{(a+~P+OP4UdbN=;nW2whFd;bM43=O{p92n+DPMssd z=(XWjP8WmSW-UuirYQ+uZ;CM1q=gm*v1lB8wONzt$C*`6mZ+X*`D9aja*dbSQY7V> zm$x^h>mSgmHHy0sIqSurI^TMA0mf_6CvJsj2_?LBF5LT-V~@^(r$w5!cVCuh-JO5- zILi-3gF7574h;oN4?kuyuyCjg$jxWN%5DGrGv-%4^Xi|UZZ*2i$Y+$Y|9zDs!QM%i zfhpt9n{efZzZ_c`I2L@|9N)|EP5BCwLc_81b*4-=`UAKd7;r28`^mcbjj(WnO9LB+ uI1{6Q!W@T+8Yu?GL!2$gmk%NCAAfg^keUX@t{hjA5L~c#`DCC7dx@v7EBjqWR$(KN zMuvyq7#Ns)JzX3_D&pSGjSX7uAkf-;zL4>s&LP&FJohIb-Ju}9Fz>(~_vdjNomAS^ zEj(E=zhBFXyM3nR^8GR#6K=fSKke#?O?UH-o6WzImYe@-&apZ^5r$*a&ZY$)kXVy? zd*$2ZzY?o&^TqsJ=z3mI2I!yAqB+V87PF)mzV4fRfFt$O?BwsYLC?*Y-t*mAGk0k+ zALHg565A(FZg1EzX~xc@j6w$lfx43z@EQO1eDJ~J=im3+o`3(hXMg#B&e!3(oh&Q18I-Z7+e?PTP4(Vy zw7kb$b>q7A@@!Xs{;24T)os7I+_xd<&)s()??+9$`!4lrDIXu(`=TJGElWPeSbeE~ z&ls_Oe*Lm|1&RN5Q>KaNS&L6+dBHC|-J(Y3cKHm3(^1mNCgKcHlkTY>sIs+@&&ceX zKF7O?!J}dSM=yQ`P6a+F=5pBiV)K3bwWrS4J=J}XFL7x;^OV<&?XOkO?}(PMwq?+r zb??%gm~||EJN@409{O0@@c82n{SWsiZs9Dbcq9M&uJi$ozsp$_ycqRt&wI8v6q_eJ z6WjQuqWHXhQ2pe6>IE;GbZq06G@Z4*?#Xb*R^#v1#|@GVzi(S#zqxg~(u%kwZf#Ha(!1Vif@80SA_x*#$ zzJm7))&}x4yVpwo)|A%U3haW=MI2jtO{vUeJ z%ka=ULY;vDuZG$7k|J@2Ol*7;7#=wQ(>NZN_%ksy>|lQM$&-OWpxhzGj+24m5nsn? hbw*;mK?lwMg_D(fXQ%5ZRs;RP;OXk;vd$@?2>@E*pV|Nb diff --git a/resources/mods/fluidmech/textures/models/tanks/WaterTank.png b/resources/mods/fluidmech/textures/models/tanks/WaterTank.png deleted file mode 100644 index ec6482af61ca00a31b50bc01a54957305071458f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPggqMpj`Xkw%7x-xwGeD?D8sLn>~)y5@@CCB zpH~JV|ND&X{q-6d6c}DG_L(>NK0f20_x4-#PU{VS`}UrH&vWo` zpv`sf__q}&=C}ue3cS)C7rmlXa$1DdH21W-40R{y1pz70=^WT;~+s-VCE(K8t^EC$j aU|AhQgF%gP?m?e9AW2VGKbLh*2~7azIJj#7 diff --git a/resources/mods/fluidmech/textures/models/tanks/guage/0.png b/resources/mods/fluidmech/textures/models/tanks/guage/0.png deleted file mode 100644 index af5d4cbe27b7e6de36cab220eacd0594cd9ee14c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 742 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JeO- zdlHwwFfcHMdAc};RK&f#Zs=(`d1eNkCzrgG@Z}+B&!m-hTbbaM@&S-@6;heDmbv!>`}D z6MMA(xB9;gtTXukfBX0AgZchv-``)_kl22neFp!>8;ihyCxs8rF{Jjl1QW{{7N>zjOL?N!uF6 zY4_Rv{`wW%i+LPtyNBVi?9Kl|Z{LY+5WT-P>2}azt_{5RL-QC5**Pfl9GPJjA5L~c#`DCC7dx@v7EBjqW7JeO- zdlHwwFfcHMdAc};RK&f#Zs=(`d1eNkCzrgG@Z}+B&!m-hTbbaM@&S-@6;heDmbv!>`}D z6MMA(xB9;gtTXukfBX0AgZchv-``)_kl22neFp!>8;ihyCxs8rF{Jjl1QW{{7N>zjOL?N!uF6 zY4_Rv{`wW%i+LPtyNBVi?9Kl|Z{LY+5WT-P>2}azt_{5RL-QC5**Pfl9GPJjA5L~c#`DCC7dx@v7EBjqW7JeO- zdlHwwFfcHMdAc};RK&f#Zs=(`d1eNkCzrgG@Z}+B&!m-hTbbaM@&S-@6;heDmbv!>`}D z6MMA(xB9;gtTXukfBX0AgZchv-``)_kl22neFp!>8;ihyCxs8rF{Jjl1QW{{7N>zjOL?N!uF6 zY4_Rv{`wW%i+LPtyNBVi?9Kl|Z{LY+5WT-P>2}azt_{5RL-QC5**Pfl9GPJjA5L~c#`DCC7dx@v7EBjqW7JeO( z9|s>tFfcF`dAc};RK&f#W9!A7$iVh6mS0r#i$t8!*4C-LP4?SAsLWy!?@^o8;9EAY zLC0fO<^DpmWj8+7ewEs@iF;1!$;Ny!1&0_GCIN+g4l?nK90KtQed`%mI`jpOhchr8 z5$|}c&A|AG`^ZPp28NHUkA84DH2h#HtYKAfsA;s=N4z!x@dTTz&zXB3?E z$Ddta=dJE`{j;O~(fMr*<=ej>{`&Oiv-H1F@%z0Gw+YwS9rz_sF8gHPeS4d|Ip->O zS$%oSnik!_`8k_WrtXE9!9uMA?{8^4*l=$acVN848nMpq@BX!QVzXZx=sd1}fABoR z;eyYewy~BUN*gEtR(i4i|5MxVpDYfh|CdboRhMx8JInF2ru)m!$2I(vz4>2g?j79+ z0X5sZ4o{o4mZAM&_4H_mJB-Bpj?6$Ag4&L-{$SW|VQnOCc<382K{9x{`njxgN@xNA DNWLa6 diff --git a/resources/mods/fluidmech/textures/models/tanks/guage/1Fuel.png b/resources/mods/fluidmech/textures/models/tanks/guage/1Fuel.png deleted file mode 100644 index 835cdb6acb4c2ca00d4db602f21af6660c50a930..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 974 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JeO- zdlHwwFfcINdAc};RK&fV*y)IeFyw^9nE=7M8H9 zlU878Q#YvjW9GoX>+hSE@9p=>#(m%aSbsO;w@>ypb>&rWkN^88F)KsB zPCh~ZW6(tZ+W&7)-(C6q@!m`4g(J$CWs>dgFif?7Aym+Fi>*TLx7mRYTQ}G+#x>U-P^>lCQ8CKd^&?w z;LJFN6I_emvN6nE;iJ!x(t5Fsxxp`FnK;9yLm9gn9n`fhb2CIHZn?{_KzQm))`m3( zxAGV+be{UcjA5L~c#`DCC7dx@v7EBjqW7JeO( z9|s>tFfcItdAc};RK&fVW7{X3D8iEa?f_$l1%r^ikjtDYGp00jun5=-zMNFRpybEU zGjXZu8gcfiSH5SdoStTy_4T#h-j5bD{+_>od|h%5Q~5E!dk@-Km=Y{F7zG#(3rpD5 zNh>h4sT_$x@lW{iBe#J;V%~udA8#`-8rU>Ge7v2JDWQVt@bP?RmIEJH+WPOa zaWp*SmnnX|lKo^So{`yZ#@Wmq4-_oi+2 zrxzb?^}YR@pRvgCM@_@pBeT0~zW=?=KcCN5{=W8Klg3o@1BGW^OE37u9?R6XcpGEh z@qN4oHM%+uh<^=W@n%^gbPryckt{ou#{13Uk7>UC${-8_vw;qI#$CrhR`cpu;Q z<@lqeRjcQ1*I`&K=63$7YJ*?MGI54Yhcb3EI;d-1=4OaY+;W#;f$-FqtPN`nZsjpt z=sfj>$stT4*PP*nOKKIPf_Bd~X@-(TMtd11h`Qb8Wv~jI8OLyfYw=q)hPf+z^chlG jFP1Tn8cUBr*w4VV*E9Q@tp8nLW@GSl^>bP0l+XkK9}to+ diff --git a/resources/mods/fluidmech/textures/models/tanks/guage/2.png b/resources/mods/fluidmech/textures/models/tanks/guage/2.png deleted file mode 100644 index 2051db92eb8076c2eaa57bd9ca0368001b8fe254..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 967 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JhAM zb^8oH1_owxPZ!6KinzCP0`o2hh_EJ$g*r5)Zt$AMC^RK@!=x>q8(kDw>(89uV?Aw^ zOK3^SJIlw}>hkx_oj<-ZIfp6#nBTnz*IAenEI1ei7!C_d*wslZFtn)~)ci4XVBqmj z`0*pRfk9&4fe#;VGcX$1G(LR1oslV_g6Z(_d}fvdA6VM@@3V0YeSg2d}@&o6rCG;ay_I-TMChZ`gKB`Tz0n?br98?%4B>)7OM!K7WDc z$GC~>|NcL{{do5I-`Pv=t8IA0cH{V;TIP^{3%n25Wl2A{f8%u?)BkeW`}u6~?-=X; z&H8uw^XuoYe}De@Xo=MrYzR~@--LKM*EAFkDA1&4p%DwpcDKwg^xZ%O6$ck<_5ozW#SB*4rT0S95t36fuKG+&0)3Jtks8sxr)Kl L)z4*}Q$iB}<)n!B diff --git a/resources/mods/fluidmech/textures/models/tanks/guage/2Fuel.png b/resources/mods/fluidmech/textures/models/tanks/guage/2Fuel.png deleted file mode 100644 index 7c23a35a35f666b5b7e3bd8a2ca3c05f665dce15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 974 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JeO- zdlHwwFfcINdAc};RK&fVd8q<^2^FMeqF&fCUFmNxW(c!4FPlEsd|Mc?PrOzK@US8+a+0EEz_&&eklza(`%;If~|9bbnQ~FT<{70eT zj(Fxhx89xmKV5&`{hI$DKfn9>`(0`X+N(y;f8C1bixZ$ zhxuQMId$rJ3;x)BxbmLmc~aE(*wf4#@=DL7>{{QLe%$VN>BlwqR=tlFYY63D{QMQi z0^zAISsT_E+{$CP(0S?$lS7z9t~tXCm((go1?`?~(hMbwjP^225OurF%U~5aGmhZ| z*W$Nq40Bib=rg3WUMyp7@C#Wc&amlF#%@Ljb*;jA5L~c#`DCC7dx@v7EBjqW7JeO( z9|s>tFfcGjd%8G=RK&fVW1A8JQ9)m<}J$ zXJ$F@fu*hgJ{!pfv@vhkZYQ6x|Ni`t^2^D5_v(KYeVX^&U!H&c@An_gcQfAGQ@6YN z}GUO z*SgHj5Sh5;F2e%hsV`X@))?H%W4O?H>I;)Ym_)8Q!wZ+xDnw``-v(jyS+8TA-FvYXpt#eg}F!PC{xWt~$(697$2jmQ81 diff --git a/resources/mods/fluidmech/textures/models/tanks/guage/3.png b/resources/mods/fluidmech/textures/models/tanks/guage/3.png deleted file mode 100644 index 7b693fb38586da68a2dcf391a8736c7c66a382f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 790 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JhBD z`fwF_1_q`!PZ!6KinzCT{Pma%8Qeei?cE*mb8-RC@wU|Z>5{qBSL)=M z-zCl(ANTDy&tKHdmoMMn>R#5kSjY0iRVJ2>ZU+XYBjO#8wHX*6aUc08+Q9IU_0bP5 zhlU?ag*B`S4mFJy``(3u|B=p^w{KtR-;W=^t!6lV-u4))T6n|X{yduk_WhZ= z8yMz?|BGn&%R1}3KMPAh!+sGyjs*;bj3N*88P&d99a#6D^~~>cwHCW>-e)>?oqgM0 zzk(f_%YV*J(?4L+|MdUAS10c>mCZf2Hfj6PH0=X)=<(`$as(O Y#7B3xbx+MBfQgjB)78&qol`;+0BG$rSpWb4 diff --git a/resources/mods/fluidmech/textures/models/tanks/guage/3Fuel.png b/resources/mods/fluidmech/textures/models/tanks/guage/3Fuel.png deleted file mode 100644 index 3315ec97f34055ac81a1dd9769de51f4cd43ad64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 975 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JeO- zdlHwwFfcINd%8G=RK&fVm^m=;_$U1M zk=wu^G4H^KkGB~Z4Qv`8KHkpAlu*HR_;@}u%YhFpZTx46ydDN3C8E!H73-7aGsAaE^YDoRh zEwS&WfB*hJY!>tQZNANUP!iNVZ-)&-_qVp*rMp?@%>DC*dGY3|)$_LNFsv4HJAYNT z!7pT)IK!qx8M_%B)U_^iGejnCxy!IXcrRJ_$?d5+!a3h3@NP_%a})vrAHv_XJnk=QtFx^ SunCyE7(8A5T-G@yGywpy>Vt{^ diff --git a/resources/mods/fluidmech/textures/models/tanks/guage/3Lava.png b/resources/mods/fluidmech/textures/models/tanks/guage/3Lava.png deleted file mode 100644 index 2ffdd83946dfe63a4d810c383cd841a35eafa08c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1003 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JeO( z9|s>tFfcGjd%8G=RK&fVW1S}wD8g!+)6l^>;Q-TwA07f5gOY-nl!P2=l!7K#FuJT^ zc;TpPn9$9swX%G*YPL>xNy$6QuX+9IFAn#|Uw6HJgC(zb?w*7FoGb?l1eg>U+SCnd z{+Ky1@c1YE_>tSdATjU2hmW@z7!7P1A3omB$dpjQboh8aGs}SwEN%Vw**F>=a`MRU z=M`W$EG%JHCrz>e5_|^^{;Fv>{IDSCZfU<|#rKb&Pgc*ftFzeiuKsv@8S|dHug@Oc zoa}yl{@Yt||J&50TF$fI@Y=KP#O#0nz8zkkeExU#()nr&cC-F@FYrf_TRt1uKq`U3OA_J&*l>2gA3?`}3O& zEPNAw@@|;_r&gHdfC0m{$^ZYIPMyz~r%-?MKajA5L~c#`DCC7dx@v7EBjqW7JhBh z-!D@SGB7ZOc)B=-RK&f#vE(jAYZ85oc79{H%-!0?Fe z(GM{PhC=4T8g7M#9gP*B3hdOf5MxuKN*sH+MTz5nbEww-)COShwa}E z>m7LcrE;Nde0|!7&nCzI+lfqVxV_?XOq8a&!QGSo4o YxoR%j_2jn{Fv&4^y85}Sb4q9e04Zk_>Hq)$ diff --git a/resources/mods/fluidmech/textures/models/tanks/guage/4Fuel.png b/resources/mods/fluidmech/textures/models/tanks/guage/4Fuel.png deleted file mode 100644 index 78be6f51b4f8c891a82db2d8406e0baa5952ce89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBAX}2Ry9>jA5L~c#`DCC7dx@v7EBjqW7JeO- zdlHwwFfcG>dAc};RK&f#v)A`<0t4H_8H_IkiZ?Ksco^uhivCux5@Qe&(NwhWQkAOz zzJ$?r*^bXYO+6pJeEodur&CfpPEBIIFCpMy!@|g+kf+d>&&VQRE^vH115<}|$Kz-Q z#v{B(KI%3wJYswFL(GApkh!piTcKe`qs2Z}0f##dGWVH?)+WH85cTRahP{AOkAlJZZ zA%Eb}K6Z<5f(7Cii}jz^=1KmWf8gzR=H>g;XDrX&v$&ljA5L~c#`DCC7dx@v7EBjqW7JeO( z9|s>tFfcI9@^o-k44EF?Eh37oeUpPOFI%vPiF2u!v=pDi zQBH>Z6jg7tOY2-7*V}~$J`wqBBbUGJ!=K;p4J|iu?>RAv`M$10!wwD>1&5kOi+xN2 z3i}*n;u$#v;uZSVGq7~%3mgw;U^*h+@mQOI@e%itkD?6>A6Xy$;BsjA!BkkoO0+fw zy#sr$erG=Oc~ALEzP-;LoZdcrZ}Gjodwb&FE&p+t>%+@mpT9hN{9E?p&7ViVd_I2n z?|Jz>{Es)X&8}wADgU>>{6Eu|JMZ`ZpS5iL_Ht`Z8GrE`a~PJ#9SPT8{_@pVXGXuj zzb~Gbk8AjPF5c?_hgd@GH+|It7S@ROHS-zyUfcgsPT2eTy3mRP|CkPQZ@BaGbUmXT zvrJfh@qK2QU*aDOXMK;GcWuW*?hSSJAMSi-S$@{^-p#|@2KQ8d?{@*ZK&JbBVBwvh t!(0V2`!?G!J>nA}GZcoiHed|Pr~h%A7;9>>8<=nzJYD@<);T3K0RZ9iJO}^) diff --git a/src/minecraft/dark/fluid/client/ClientProxy.java b/src/minecraft/dark/fluid/client/ClientProxy.java index b903b2b7..3c005267 100644 --- a/src/minecraft/dark/fluid/client/ClientProxy.java +++ b/src/minecraft/dark/fluid/client/ClientProxy.java @@ -30,7 +30,7 @@ public class ClientProxy extends CommonProxy @Override public void preInit() { - + } @Override @@ -41,15 +41,15 @@ public class ClientProxy extends CommonProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityStarterPump.class, new RenderPump()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRod.class, new RenderGearRod()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGenerator.class, new RenderGenerator()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTank.class, new RenderTank()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityReleaseValve.class, new RenderReleaseValve()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySink.class, new RenderSink()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityConstructionPump.class, new RenderConstructionPump()); - + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTank.class, new RenderTank()); + MinecraftForgeClient.registerItemRenderer(FluidMech.blockPipe.blockID, new ItemRenderHelper()); MinecraftForgeClient.registerItemRenderer(FluidMech.blockGenPipe.blockID, new ItemRenderHelper()); MinecraftForgeClient.registerItemRenderer(FluidMech.blockReleaseValve.blockID, new ItemRenderHelper()); - + RenderingRegistry.registerBlockHandler(new BlockRenderHelper()); } diff --git a/src/minecraft/dark/fluid/client/model/ModelTankSide.java b/src/minecraft/dark/fluid/client/model/ModelTankSide.java new file mode 100644 index 00000000..ea88c272 --- /dev/null +++ b/src/minecraft/dark/fluid/client/model/ModelTankSide.java @@ -0,0 +1,179 @@ +// Date: 6/3/2013 6:47:54 AM +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + +package dark.fluid.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelTankSide extends ModelBase +{ + // fields + ModelRenderer tankBack; + ModelRenderer backRightSiding; + ModelRenderer backLeftSiding; + ModelRenderer backTopSiding; + ModelRenderer backBotSiding; + ModelRenderer topLeft; + ModelRenderer topRight; + ModelRenderer botRight; + ModelRenderer botLeft; + ModelRenderer botRightOut; + ModelRenderer botLeftOut; + ModelRenderer topRightOut; + ModelRenderer topLeftOut; + ModelRenderer tankBackRight; + ModelRenderer tankBackLeft; + + public ModelTankSide() + { + textureWidth = 128; + textureHeight = 128; + + tankBack = new ModelRenderer(this, 21, 43); + tankBack.addBox(-6F, 8F, 5F, 12, 16, 1); + tankBack.setRotationPoint(0F, 0F, 0F); + tankBack.setTextureSize(128, 128); + tankBack.mirror = true; + setRotation(tankBack, 0F, 0F, 0F); + backRightSiding = new ModelRenderer(this, 0, 19); + backRightSiding.addBox(-6F, 10F, 6F, 2, 12, 1); + backRightSiding.setRotationPoint(0F, 0F, 0F); + backRightSiding.setTextureSize(128, 128); + backRightSiding.mirror = true; + setRotation(backRightSiding, 0F, 0F, 0F); + backLeftSiding = new ModelRenderer(this, 0, 19); + backLeftSiding.addBox(4F, 10F, 6F, 2, 12, 1); + backLeftSiding.setRotationPoint(0F, 0F, 0F); + backLeftSiding.setTextureSize(128, 128); + backLeftSiding.mirror = true; + setRotation(backLeftSiding, 0F, 0F, 0F); + backTopSiding = new ModelRenderer(this, 7, 8); + backTopSiding.addBox(-4F, 8F, 6F, 8, 2, 1); + backTopSiding.setRotationPoint(0F, 0F, 0F); + backTopSiding.setTextureSize(128, 128); + backTopSiding.mirror = true; + setRotation(backTopSiding, 0F, 0F, 0F); + backBotSiding = new ModelRenderer(this, 7, 8); + backBotSiding.addBox(-4F, 22F, 6F, 8, 2, 1); + backBotSiding.setRotationPoint(0F, 0F, 0F); + backBotSiding.setTextureSize(128, 128); + backBotSiding.mirror = true; + setRotation(backBotSiding, 0F, 0F, 0F); + topLeft = new ModelRenderer(this, 0, 0); + topLeft.addBox(4F, 8F, 6F, 2, 2, 1); + topLeft.setRotationPoint(0F, 0F, 0F); + topLeft.setTextureSize(128, 128); + topLeft.mirror = true; + setRotation(topLeft, 0F, 0F, 0F); + topRight = new ModelRenderer(this, 0, 0); + topRight.addBox(-6F, 8F, 6F, 2, 2, 1); + topRight.setRotationPoint(0F, 0F, 0F); + topRight.setTextureSize(128, 128); + topRight.mirror = true; + setRotation(topRight, 0F, 0F, 0F); + botRight = new ModelRenderer(this, 0, 0); + botRight.addBox(-6F, 22F, 6F, 2, 2, 1); + botRight.setRotationPoint(0F, 0F, 0F); + botRight.setTextureSize(128, 128); + botRight.mirror = true; + setRotation(botRight, 0F, 0F, 0F); + botLeft = new ModelRenderer(this, 0, 0); + botLeft.addBox(4F, 22F, 6F, 2, 2, 1); + botLeft.setRotationPoint(0F, 0F, 0F); + botLeft.setTextureSize(128, 128); + botLeft.mirror = true; + setRotation(botLeft, 0F, 0F, 0F); + botRightOut = new ModelRenderer(this, 0, 0); + botRightOut.addBox(-8F, 22F, 6F, 2, 2, 1); + botRightOut.setRotationPoint(0F, 0F, 0F); + botRightOut.setTextureSize(128, 128); + botRightOut.mirror = true; + setRotation(botRightOut, 0F, 0F, 0F); + botLeftOut = new ModelRenderer(this, 0, 0); + botLeftOut.addBox(6F, 22F, 6F, 2, 2, 1); + botLeftOut.setRotationPoint(0F, 0F, 0F); + botLeftOut.setTextureSize(128, 128); + botLeftOut.mirror = true; + setRotation(botLeftOut, 0F, 0F, 0F); + topRightOut = new ModelRenderer(this, 0, 0); + topRightOut.addBox(-8F, 8F, 6F, 2, 2, 1); + topRightOut.setRotationPoint(0F, 0F, 0F); + topRightOut.setTextureSize(128, 128); + topRightOut.mirror = true; + setRotation(topRightOut, 0F, 0F, 0F); + topLeftOut = new ModelRenderer(this, 0, 0); + topLeftOut.addBox(6F, 8F, 6F, 2, 2, 1); + topLeftOut.setRotationPoint(0F, 0F, 0F); + topLeftOut.setTextureSize(128, 128); + topLeftOut.mirror = true; + setRotation(topLeftOut, 0F, 0F, 0F); + tankBackRight = new ModelRenderer(this, 49, 43); + tankBackRight.addBox(-8F, 8F, 5F, 2, 16, 1); + tankBackRight.setRotationPoint(0F, 0F, 0F); + tankBackRight.setTextureSize(128, 128); + tankBackRight.mirror = true; + setRotation(tankBackRight, 0F, 0F, 0F); + tankBackLeft = new ModelRenderer(this, 12, 43); + tankBackLeft.addBox(6F, 8F, 5F, 2, 16, 1); + tankBackLeft.setRotationPoint(0F, 0F, 0F); + tankBackLeft.setTextureSize(128, 128); + tankBackLeft.mirror = true; + setRotation(tankBackLeft, 0F, 0F, 0F); + } + + public void render(float f5, boolean left, boolean right, boolean bot, boolean top) + { + tankBack.render(f5); + if (!top) + { + backTopSiding.render(f5); + topLeft.render(f5); + topRight.render(f5); + topRightOut.render(f5); + topLeftOut.render(f5); + } + if (!bot) + { + backBotSiding.render(f5); + botRight.render(f5); + botLeft.render(f5); + botRightOut.render(f5); + botLeftOut.render(f5); + } + if (!right) + { + backRightSiding.render(f5); + if (top) + { + topRight.render(f5); + } + } + else + { + tankBackRight.render(f5); + + } + if (!left) + { + backLeftSiding.render(f5); + } + else + { + tankBackLeft.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/dark/fluid/client/render/BlockRenderHelper.java b/src/minecraft/dark/fluid/client/render/BlockRenderHelper.java index 75510373..a5598a69 100644 --- a/src/minecraft/dark/fluid/client/render/BlockRenderHelper.java +++ b/src/minecraft/dark/fluid/client/render/BlockRenderHelper.java @@ -56,14 +56,7 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler } if (block.blockID == FluidMech.blockTank.blockID) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) 0.0F, (float) 1.0F, (float) 0.0F); - GL11.glRotatef(180f, 0f, 0f, 1f); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(RenderTank.getTankTexture(metadata))); - tank.renderMain(0.0625F); - GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(RenderTank.getGuageTexture(metadata,4))); - tank.renderMeter(null, 0.0565F); - GL11.glPopMatrix(); + } if (block.blockID == FluidMech.blockRod.blockID) { diff --git a/src/minecraft/dark/fluid/client/render/RenderTank.java b/src/minecraft/dark/fluid/client/render/RenderTank.java index 97e4965e..d91d9bf5 100644 --- a/src/minecraft/dark/fluid/client/render/RenderTank.java +++ b/src/minecraft/dark/fluid/client/render/RenderTank.java @@ -1,152 +1,75 @@ package dark.fluid.client.render; import hydraulic.api.ColorCode; +import hydraulic.helpers.LiquidRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.liquids.LiquidContainerRegistry; +import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; -import dark.fluid.client.model.ModelLiquidTank; -import dark.fluid.client.model.ModelLiquidTankCorner; +import dark.fluid.client.model.ModelTankSide; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntityTank; -import dark.library.helpers.ConnectionHelper; public class RenderTank extends TileEntitySpecialRenderer { - private ModelLiquidTank model; - private ModelLiquidTankCorner modelC; + private ModelTankSide model; public RenderTank() { - model = new ModelLiquidTank(); - modelC = new ModelLiquidTankCorner(); - } - - public void renderAModelAt(TileEntityTank te, double d, double d1, double d2, float f) - { - int meta = te.getBlockMetadata(); - int guageMeta = meta; - LiquidStack stack = te.getTank().getLiquid(); - int pos = 0; - if (stack != null) - { - pos = Math.min(((stack.amount / LiquidContainerRegistry.BUCKET_VOLUME) / 2), 4); - if (meta == ColorCode.NONE.ordinal()) - { - guageMeta = ColorCode.get(stack).ordinal(); - } - } - - GL11.glPushMatrix(); - GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); - GL11.glScalef(1.0F, -1F, -1F); - - if (ConnectionHelper.corner(te) > 0) - { - bindTextureByName(this.getCornerTexture(meta)); - int corner = ConnectionHelper.corner(te); - switch (corner) - { - case 2: - GL11.glRotatef(270f, 0f, 1f, 0f); - break; - case 3: - GL11.glRotatef(0f, 0f, 1f, 0f); - break; - case 4: - GL11.glRotatef(90f, 0f, 1f, 0f); - break; - case 1: - GL11.glRotatef(180f, 0f, 1f, 0f); - break; - } - modelC.render(0.0625F); - } - else - { - bindTextureByName(this.getTankTexture(meta)); - model.renderMain(0.0625F); - bindTextureByName(this.getGuageTexture(guageMeta, pos)); - model.renderMeter(te, 0.0625F); - } - GL11.glPopMatrix(); - - } - - public static String getTankTexture(int meta) - { - String type = ""; - switch (ColorCode.get(meta)) - { - case RED: - type = "Lava"; - break; - case BLUE: - type = "Water"; - break; - case WHITE: - type = "Milk"; - break; - case ORANGE: - type = "Steam"; - break; - default: - type = ""; - break; - } - - return FluidMech.MODEL_TEXTURE_DIRECTORY + "tanks/" + type + "Tank.png"; - - } - - public static String getGuageTexture(int meta, int pos) - { - String type = ""; - switch (ColorCode.get(meta)) - { - case RED: - type = "Lava"; - break; - case YELLOW: - type = "Fuel"; - break; - default: - type = ""; - break; - } - - return FluidMech.MODEL_TEXTURE_DIRECTORY + "tanks/guage/" + pos + type + ".png"; - } - - public static String getCornerTexture(int meta) - { - String type = ""; - switch (ColorCode.get(meta)) - { - case RED: - type = "Lava"; - break; - case BLUE: - type = "Water"; - break; - case WHITE: - type = "Milk"; - break; - default: - type = ""; - break; - } - return FluidMech.MODEL_TEXTURE_DIRECTORY + "tanks/Corner" + type + ".png"; - + model = new ModelTankSide(); } @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float var8) { - this.renderAModelAt((TileEntityTank) tileEntity, var2, var4, var6, var8); - } + if (tileEntity instanceof TileEntityTank) + { + TileEntityTank tileEntityTank = ((TileEntityTank) tileEntity); + ILiquidTank tank = tileEntityTank.getTank(); + LiquidStack liquid = tank.getLiquid(); + ColorCode color = tileEntityTank.getColor(); + + GL11.glPushMatrix(); + bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "TankSide.png"); + + GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 5F); + GL11.glScalef(1.0F, -1F, -1F); + model.render(0.0625F, false, false, false, false); + GL11.glRotatef(90f, 0f, 1f, 0f); + model.render(0.0625F, false, false, false, false); + GL11.glRotatef(180f, 0f, 1f, 0f); + model.render(0.0625F, false, false, false, false); + GL11.glRotatef(270f, 0f, 1f, 0f); + model.render(0.0625F, false, false, false, false); + + if (liquid != null && liquid.amount > 0) + { + + int[] displayList = LiquidRenderer.getLiquidDisplayLists(liquid, tileEntity.worldObj, false); + if (displayList != null) + { + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + bindTextureByName(LiquidRenderer.getLiquidSheet(liquid)); + + // GL11.glTranslatef((float) -0.475F, (float) -1.5F, (float) -0.475F); + GL11.glScalef(0.6F, 0.999F, 0.6F); + + GL11.glCallList(displayList[(int) ((float) liquid.amount / (float) (tank.getCapacity()) * (LiquidRenderer.DISPLAY_STAGES - 1))]); + + GL11.glPopAttrib(); + + } + } + + GL11.glPopMatrix(); + } + } } \ No newline at end of file