From 743fd8b44cf14474c7c7f417dc25fc11fdad0ac7 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 19 Apr 2015 18:03:48 +0100 Subject: [PATCH] Changed Corporea Funnel texture sides. --- .../block/corporea/BlockCorporeaFunnel.java | 4 ++-- .../textures/blocks/corporeaFunnel0.png | Bin 16651 -> 16486 bytes .../textures/blocks/corporeaFunnel1.png | Bin 16721 -> 16651 bytes .../textures/blocks/corporeaFunnel2.png | Bin 16486 -> 0 bytes 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/main/resources/assets/botania/textures/blocks/corporeaFunnel2.png diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index eaf5124b6..0ce2ef19f 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -37,7 +37,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab @Override public void registerBlockIcons(IIconRegister par1IconRegister) { - icons = new IIcon[3]; + icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) icons[i] = IconHelper.forBlock(par1IconRegister, this, i); } @@ -57,7 +57,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab @Override public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; + return icons[par1 > 1 ? 1 : 0]; } @Override diff --git a/src/main/resources/assets/botania/textures/blocks/corporeaFunnel0.png b/src/main/resources/assets/botania/textures/blocks/corporeaFunnel0.png index 3d9fa3cb65ccbf52add34ccf52a32cbc528f9960..f053fde201f791e82a07b5d7b72cf2c699ae5041 100644 GIT binary patch delta 815 zcmeBfVtm%XIKh%Jd81VYGpm8Im9fF(?aVe1*5)6~*^HYvuxc@?q?j2bC#RSh>Lw+n zBvh`u}DpN*US>Gtik_CrrA%wR>nKPWWx6aYg}D~q~(tARo_mW@+9}U%|9!TXm6{E ziU*Yy56XYkpAbuN{vj6(4SN18>qo-=6~Z_=@=i~gSf zUsyh8f$G7KVwU+v1uPO<*E}d(a>3+gpyV8jySppezXxQ$d11n5(`GqCFypfR z;>=CSIr0g{^OPss9NDnL|L>c6v9Ft>r@Xc@l(f3p^IU+Hv-j4qIdwZ3UIg+zoOe@I z=Io_>X-7%x13y@^jvtz0CLvif(Rn-H%qNPA6do2XnUU2e!mxPSRGS5>-inFaIj7#2 zeNttdpZ#j(tB)7vF&utm7q*$ZU-{^Y)TInF-bFa476|pF1s>yD@kUNrbN%BhFN5m6 z&dpi6>%G~o(v0d~fB#FZ;5nzfQ0;O_uJg~MVP2=SG&EN~s4KPIx;Hr{@)XE}ryl5B zdk}ZuOwOHa_06Na@A*pKJJg*$DqX2NwaWOp{Jtfb!l(4*Et9#Iaz+Uqm8y`@jN55H z$y4sqrZ1CU-7`ET<$L9B?Xj!;0h|AH*WKo*U!;)8y|la7;O@pYw_Iltl||?47ldW5 z%qV=Cd&Tajn_A_GG@JITZ>-iip4l-={NtQuQ-R@o=z+S6qmzh=p6Lt@_su^ywq82Y zvzoOb>|&_M_5I~rkM)&TyuUGbyP?u&gR3$p#nm%BF9hB#UgPs$Oj~}*gfo5qk_Xm* hm|wByRH1ksKf~c(6H(KfrP&NX;OXk;vd$@?2>=VJX|MnQ delta 911 zcmaFXz}VfyIKh%}!$zwLW>!N3D+9C1+nH@3tj#}|vl%D9U{jl{%qFrqfYp{!#nLp@ z*x20AR5!)a*hDwc*u+rR!oa{(*V4q?!ra0lImIB^aPvmCQ!GTOoIIb~0cI&j#pHFI zT$|H)tPNSp{&Aa4UTUjff7R2)F{I+wl*`c`lM5w|f4nPlnlI?pr`V?jvz9(v=39ID zUP`9#+;+ZgYvaVuHpNJ8-RTvvmN_saZ1b)TBmF%W0#3i^xp;{$sb!jLVyU3$)0R(% z7OY;7FMiDJhOaok&7b-YjrKP7M+041^WM(;FE>4)*?EP_#T5mCbA#I5xhB*LOm>}> zrds#6^iSs7iX{i)cdyWM6**I}gyE`Y>5i6Jh7QwiT~LcUQM^}eeJw}fPd2e-YaI2e zIu3smid`jYc;7GXw}9Al>q*bnyH2}Ru=-B&fwY%mTFpLD`YyL?*W^k(eAvvNqPF(X zg3Sf*eDuBbdjxX72YzHpDmL3-`}veaLA}j0jcZ+bLh{X7&t27yt1iA5)vw5K_j=ol z*MB~pKl9`bKXdo$`I9d&PTcwQO}LxE-7WK4_)e^^Yklxv=+rs?kT#>w%l3T`_c>SB zGSzR%wCz5IB0{ArxPxm2zFv*jvG~{dXtU#@vaJT8`7XPx&h!MS&z^RdlbPF9U(&rP zde5tK^_Wq2idd8m*_&z%q=k#msdy$>@48o)3*t{NXON{>9 zz?#J9_uSOypTg?h^+t(NBErjD6L)NIXC|H{J8%29J$ z-W^F-n&dhq%GPV`ycbW)(tfZT=#^f${G~7H{e%1Ez(C`=c4@iJsW|uRdj+GU+b+JT zKD^`#liE@-gVo>c*76=MxhtI*_|2+oZ}UUzjF24ytj5b%Re4N*^TTi7@$yf$A0KIb zT9p^DdSFK_XG-z*h>7BXF_HWM0n%2CdhMRcVH@=ZraKqYTW-3Gb zTh&`U(uI*mTdmo4?)fg+Im_N*?jb3y$@i}ruXA`@c6)Ka%sX1bv-ktz0wg&#WivB3F*Pk@IWsgZVKX!_EjTbR zH7z+bH#j#qIAdfmV==S-2Fe5^IW=W7GdD3cEo3<}G%aB>G%+nWFfcVOIW#voH#j(B zWH4hflfMW!4Kgh;HdHV&Ix#RhFgCL>481V~cK!=Clkz<-e*)D>L_t(|+LY5My#Zg5CZtb4`9+yyqL#Ra2 zsBlr8Qin$he~=K9MVe+Me*Ja)Y3+EVz+bzlE=3f~c%%T;DRsDnnlV6@+R!Fi$aB3W zuYCw{`34rItU)e%h{N_0U8)r^-%eip5EkbsfL&;gOTtGj8AAc5Lm+bgXzQ=d+J@Miy@~Uo7xaBs>jB@Bb za9y%J<$vJD5Z>=>ZfJ4l&j0Eg`*+6)_USu(Xd2D!ZV z8Ht)dK%K%GDwE&VGp<16cH5&+ncONj3a_FBmr#RS<^Jz+2$lRE01whM6XN)UZ~y=R M07*qoM6N<$f*paEG5`Po delta 957 zcmV;u148_Zf&tNj0kF0M0W_1h13&>Zv-ktz0wiTLV=-Z7Ib|(1Hf3ckHZU|{Enze{ zWG!VgGdM6fIWRFYW@NMe2Fe5^Wi(?kVP-jHEj2b}Wi2)^G+`}aG&y7~WivB4FgQ6d zF*0UklfMW!4Kgh;HdHV&Ix#RhFf_9<481V~yMoAylkz<-e*+syL_t(|+LY37Oq2xx z$MM^oTPT_5!LbLk{%v-V+qbFx4XE18gxQgTkN=#o@|;a zlBNO!CX6ecZa$(7Mz&a5+L>$CatT}U(#@@{Z!d1^>ZLD!+waw9`)xl}MCBl`?$9&G zF9c~7+E5LufBbmNF+!3;m+>fGV-&e)l8MMYLXv`99RIg>n@-@%j}Vd+JmwgFA(#YQ z(io>>cc}2+qhkCqjrCJF?U!+F{fgG6@2T1nVSB>}+kA8EbX@1mksokLV+6E;B(P7q z#On=LD4c`zjW(JGmeAC+&>fiLy#sSRU)w_EsU`ACf7)<-4c7WmI>d`fAetG$>9|4e z3_NGvglXy#>0%8Xdlk-(K4AFV&m4RA7MfjeVVZixYKxOn1+4A!DPV6=KZXfdVJf3` z{1*%-XIZoBeX2Zn5#-;|`p&cN*fga#pQ5hYjbQ@z6&^`Vu(r>Wn^}f5{1Zi;ab9qr zL=YWhe^36+`si0Llm-HfejkWBw+R%&#V ze*Ooxp+8xv(UEodOSXt_qpoaXtN%W3Q(p==Y#yYk@h1AU7TVjVu*wVUxbYXp$zRDk z^DWl+6D%Js;N5eTmtL&JWmo9&PNaa4q%hL+e;s??xPT_#%Bnn(oZxYmrKPhhEgfC> zGgjq^sI%8|zloa5S#_06^h@f4|@xBDRKYq*#(?*tO=vbbiBjeQ;*2uRx z5q&^`p_saG;{QMB5HI4a{|5EyT&AxrF*>k_{+;`z6;zW}P)$zfbw&pknZC9}fpG_Q zf8j*x2ZJgh3&6hLT|KD7fxW`c^iYio^nfsP1R94eF<7N58-~fHwna4 zPCVuq!Tcz4(<~uLK~!6i3&-&qqxkasH;@a*F==a%i{r@Ft8|D_Jmy#u2&-)Pg&+ZK f;F;4ZwDHdX*$_5E#XV<600000NkvXXu0mjf;QGs4 diff --git a/src/main/resources/assets/botania/textures/blocks/corporeaFunnel2.png b/src/main/resources/assets/botania/textures/blocks/corporeaFunnel2.png deleted file mode 100644 index f053fde201f791e82a07b5d7b72cf2c699ae5041..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16486 zcmeI4dvH|M9mlT@bRd*qDe?*>+l?R;Z|-v+_ja>1>;eh0kU)fhEpqqXv&l8ty_>xo zb`#|>qP49WDUS})2s8qNg{r_XBDVFFpiM=2YNJC976+vibhIOMr1ac;0^ZlK3KfiN+=iWayKd+cKdwAaXJc1yGmzQ}Lz|UKZ_mFSFzlEP)m*B_H zaM==_AoAOd_f4Cop;}v2Q_M_ z#CrL~m#h|5DX}iL`DkC*18UW><_K8WJg-V_u9F4DI^CV;iiQJ3`a3E#R??D zh`d8&?3UEa>du4TToEN8F7VDu4F|0fYi%?d7AYzgixtPXVl7fbF@hjaG)u88344%w zQz$CM$&g-@43duH1-cwj!%K@fzZI@B>ab>Uhqs_C^_KSTDo`yCkO#OLc7JLi0Z!JI?u z(U~hCf)vu6O1-Kn45$S_*BT=-n7IO8N>Q$>kE(%8a(YEFJpIlc#MOReh9@aYEQMr- zT<}^&PXtI&EmEav_3q>Sj3OVLKs49VE5 zXhyVgBF8Mv(kDA1a-XKCfu<}un~<|24drx7p4ADJ!wsWIQR(XfWOvI7p~zxDiv*>p zTMbGzfC`6dTvVnpt7p#&5?s|DP$WUJ`3D@#4}c@UC<e1Mb`2TihehIa4(Fn&HT;9von=M+w2NO-+~ zWZ^VPf#DU>CP@G|;hb58&mAn;+B+}VNylZ?*d0EfSRT@&5=?rzH<3dX=1{TIvaHw{ z((hL!ShabHG#HV<&e4p+@3*r+O6;57@=P{Uq0^(MLL1A&!Lu9-oE&LmXd5XgFtn40 z^*q2ad;myx#_q7CLubkRgq|N!;gKfQXZ1-hnr|{hjxc?ODpQU9(A0aeCicTZ(9pXz zvmX+NPgsiRz$mRH)^u&{IjxclKDF!JMywWu`YE5uD2WdJ>vb&!1^E?y9d}=(g75n_sdQvV0x09l{@qjjf=@*n>@Q%k`}617T!aNHWnT}SsnV< z_eP07Oa}r#Gc&nX3e^C`O{Hg&Za^pVznrguRl6jZZ=NsXUL$j}@c*5!WEOi@y>zke zTP0n_J)sCIEZp)^qOvhAs!v;Hr6l`T8GC3tDJ8|G-s)d8`tEW)AOZiodsUgRgAEO=Dl5J#x$Bg~!jn<3D+;(A9eNxOLZ|InqUs&tAEA@}TkS zFRdN4xM<3V4=1dhN3EQ2X9d6R%k6t-dPf#aY|p>%eQD#l;Ca`-#j?Ba6yx#krg(Sk z%IY^pE1oL_g-^!s?c?duJ(*6ovC zsnQ2+W5a{S9^BjAu;UotRXMKJdFI9V!(Ud^UHq8OceRYV^u(FAZHtaSbkEu8H_u(R z`f+mO3n>^GWI{b-!F+ zxSZQsw87Q>+@bl`E{^`^fx9>UU1Y|IU5}o>W$@6)-aFE|>ILHC%KWoiyCzLIdO|BG z9rweRuMEET^;b9A$Bw)Im!9YIpE&pZHp|(D9h>iM8AUwxt4*%$zx~JPF>Vj|;Cttq zIj!!((-%HFwv~A8L-(Qs!yYf{*bR0Pn=e&+KzL+Jpz=um?u!$Prat?(Q=crD^H%H5 z!qTftD84Y@_b}X9H`GYA__jIpnEIIfG`NvB-jmzuozT=(l zWgpll&d%G@)iL~Xe&gjItvcFK&_r%(=FS)XafkZdPO4ClhwU7?bY#c)_=Ks;UYNeV zeBz1yUu?MWSEh5k@6?%a6NLL}_wC-&8KZ71wrw6V`@q$G51nX# zbkE>5i;mwl>fM)O2amMG;+OyO!YU??pXI`%lvUK lKl|yn`0qO#R*fKDdyK!;*40>N{3n3&ne)8Q%vk=we*oHfM$G^K