From efbbffde768c5cb1afcadecbe5ebf8821503ffcd Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 30 Dec 2014 17:48:40 -0500 Subject: [PATCH] Add buffer textures --- .../textures/blocks/blockBufferCreative.png | Bin 0 -> 1272 bytes .../textures/blocks/blockBufferItem.png | Bin 0 -> 1380 bytes .../textures/blocks/blockBufferOmni.png | Bin 0 -> 1290 bytes .../textures/blocks/blockBufferPower.png | Bin 0 -> 1104 bytes .../enderio/machine/buffer/BlockBuffer.java | 36 ++++++++++++------ 5 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/blockBufferCreative.png create mode 100644 resources/assets/enderio/textures/blocks/blockBufferItem.png create mode 100644 resources/assets/enderio/textures/blocks/blockBufferOmni.png create mode 100644 resources/assets/enderio/textures/blocks/blockBufferPower.png diff --git a/resources/assets/enderio/textures/blocks/blockBufferCreative.png b/resources/assets/enderio/textures/blocks/blockBufferCreative.png new file mode 100644 index 0000000000000000000000000000000000000000..687230ab0f69adf113b065b027c422037486fb56 GIT binary patch literal 1272 zcmVf*`&t=!^as|APNVP<-`C6qRbV)kX24R;kts z+iIJu{FQ>g^2J)J-Ou8~2hElxh)Zn#O&`AbOtXolep176nw@f?n5jBSoj^V9Dt@ zpvYiH8d;VTzr?l%0TL={5{lvCCVhnrB`CAJvNa7g?RMZy2RGp`ZZaO6iVg!rw}ovY zuBgeYm;jUTSU9BGFMeE%li4i`5_+i;>I%HpDcQ$w{`vH|cPa!?ra$N1Mz0Ravdk9x z!H#vO-mmZM@0ZXA?$}omomK*ka%ovYCm_)Jph}d| z;C73yPDpBP^AD{CIba!2&s_jr0kk8~?{yaE+56+LRFR=L_>`frae;x+k!9Jr;|2Kf z#;~RhOx8w`r9G7U6(+o1)$AQ$0|{veJKf;E&l@|}?mQR_1|J{X(fTkGXe9;Z`G)mJ zv!o?KlnInbU@5GjKzG|t@9yrdt*yQIQjf7dQS?7&6ekpx0HA?13?y3Le_8g{*N4O5 z;9Jq3bt(cFOKP3FkTQ#`0vMi7f}PoBAwRYW7zDX|zS!E@g2t(t5iw#FQWw2w-QxUs zmd1QjzO1T>i}B5Y22loK47qpGh1%$LQUcI3 zWFk_A6&0}CG53b9aPIJVhxV*Uv=YO@)zgsma{`DIfz3OM!Pdpl!(6X{kCK-`66|Y_a0zm zBEU*(tEqH#(=DQ6}0Dv|)8$;dc!SdvOx z0-t-W{nNCC@DtcIoVg^^!uaM-%@TB{6i|wMatC*^;Rs*k0V89h^eL?-AniANypmU&AAIgP=C_9s8-%W5Fxsf zbHu_aMu@OJouHRW>eh52u>CnX_UWo7X9p$|kfZRIF;r33?)06E)4TwUGtCs6sxT%Uf6&R_si1LGyc46 zqGJcQ;p1Saq94|R9U2WSiHM0vnr_$r<{Q*LnWFubH&S{_ozihk3kgR+M@6;o$a z?qYk#=6Kwm>6z(=M5#(DsTb5^wXBwIy>68xzj^*#DJ8MNTL^dyZq`!oUKSrePa_*w z3W<;36`TC_#S0A*v_>h4WJG-H`}Fa0Q*@`75CZ|m826_Xq8CL`mZR}_G=gqCqMsYO znNc|^u@&_EPYaV}802|D`jXlb4A9gv9h>saedG=m(r9z|g{@iaX}1ISa&Qw)<0i%6 z)MT6>xdUvKXhlQ6$_wx!7z?Mw@P~iCDQB}=7A<6}H2oXkVGYHHH)F7*XNU`~O=;s9 z7S=1ToLtxI`TQD{LlseVTCK1T=z=Ngv90HjjngEbtx>XG)$7d$l)t)qCsnkM@UlpG zAuj&aYl0sD;;J>! z6IOk%x^4N<-X8qm>yumodQ7gwuQ8A!u!Ah1#Ir_1;;pOtKoz;}XwUg&_1(+Uv$L~T zr!S9YJ1}EJ)>btvP#o{~(mAOFP5^ls(ppNF)~}Xihx7QO$p?3Ky;`l#&(DAVyZ^MX z2bnawbl=-j%9V$bLwGJB=n`)M=nkJD!l!>|9j)Hf>*m>;H;cvM?A_>f<+SNdOWT+A zhBe*W-}9WSI-k{8rxF+`!;)+I{x1Rz=CSpZ?YaO??L< ze0qR|ZEF)38DAt#e>`4xMvH*c6`MbQ`4I-69~X}&z+g|RW#e{seAi9+*xY3w?d?xcc)GkR=9eG&k(7V-~b@OH6a z0l>?L+XkRH8-SytEMU!|&ONL}RihEEHVCDhi!ctJMPvrV0EnMznkE{20w49;1_rVR zngN9KyDuq0LLZDE(2T>5Cs1#;9VNkf>-sb&MCVFE+dG|1YcUTz`f}w8#)q>Rkq4ki zYv&>_++rRoJ)U|C00vwEUP_&Yc4SaU%H3Tlw|rEK;4kK+A32&PT!R^a14n1OQ;Gox zgMv);0|twFiRUvj9w88yB~b~=d~#!`pfB|P+1*myL6*8qMy$MWxmV8bm;2=;FPw{V z4I38mPLNn20zpF_P<4m0r_|fa>z^*&ta3F6<`zm2+i#h=y%E}_pjdCV090=_T&{1c z3SxT@>}FR>K0uzHd@1lmOv<7^Fgc^7NG>l{zE+*)tAkH|p=p|C+cYds@p)-b zo4B7I2SXjbd?D+Dj6N*JC5fZ1E81{H(cV@PwN>CD7sD#ublnVk03DiTSB7s!3zoG}u{R{jCegan{dPkfJ zDiT$NAOdlSk`j{Lq)W)`Y<70WJbvHT9($7ruh--8*w5ql(@yR^c%ZdTsNks-p2`1V2hezK}B$)^t=reH`@V$sae;~QzipYVq0c3(8}5e?HK?ZLSu{Q&bu*gDu1cV(6k2!+R@Ar)8pOVL(lJFS<{OO^7ggU1}Uk6--P zFF#WKVfV$;gI}Nh_Vl~ZZO-cX(d0r<4R+{;NO#Y~;6?Ark z&)ywB`egaVoerI9HYXpl=<`_(G;ESM{1SEl+4sJlR+X2JfpzcluGuU{zwe%$oh?FN zWpo|@$7DS51S_RiC2d#Ja>Lu?u-Z8kpqp!J%!vxgpVY8G-w( zIc#iTP;}t+?X3cSygzNjU?ZMBXdRAyD|F(kl1$*dL#fP#G{P&dyISTNuf#CWRHW%M0yHBmguv zg@LARzx{b}dv|v_oo*i#r{qO|F(i3`6f!EE3?jzWR7bGRY}}6s;9G+<{qR;XnN0Bc z#^vkPa})+e*;1HG(H&}x^cIJl55j*eeB&5Hw{wwClIArH;wIuLDmdZv}s3ce<1WuL;CUXlctSr9f$ZX5I1)r{w0n@i^607yCZCsyWqDGJzbUvh-R;i+fN$7IY^BCwUa#IZX#=jb>!k|T289ac^?MBufgh1=NtXHy^@J(TshBj-db4|#H| zMxSJ2heUL?Sa?3|&&w`2c4!&>EDSgNpw?mcosOpjWd8EYw`+g%?bUuhMf)qSzY?#g z)4kYDI|@sX1VzR7WbVa*WPH#E23wsV*A%7x1A_OCFu9PVK>z>%07*qoM6N<$f@ZK| ABme*a literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/blockBufferPower.png b/resources/assets/enderio/textures/blocks/blockBufferPower.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb0ce3a7ae200f0c0da188a3890030d13ff6e71 GIT binary patch literal 1104 zcmV-W1h4yvP)3VM zomqRn`L%67U0*xrED^qq!M9NY;6A*7p2+7Bq?yLj6IUg&pC^+F5vqz%9AhN;5c~Xz zxViM8moWu^_dfibBk6Trk4DYeS<_&5)^H2Mz-dO!h^Xf084~752E$>^`m)*<4XBs~ zRU#KDeAJEo((vUHGoULAx-99l$dTI5tXlT8f9Eo8e)D;~yK5gS$%&4h9YdQ8;_W$m`R{o#Ph&t?zSCHq*OODUh_eUX5Yt3^_Z zQrpcIr85&T(DLL;%Gv=f2UZh1%dcF%Ks-nG{QUgl;$ppCBh1GS?~xOVONuqPh?NV4 z!PNl~pmDYdMJLj!Q>GXYZ7~@ua$`7+lai*g6T%N~hZQy>_>7=Tjg>X|&LW7Jjcft< zLcZ_2=miHwQ3}?RO{Nb(HV*s@yk(KVSCx}#5Ll$BGL5=`X#9G7Wv%*B!v;M77bZpZ z-wg-Y|BOLk^u){+)r}Qb$MP_yZCl7(v7luroK-mg(?+tcxQ?7EIqp8*0gr!c4M|4KJnMZ7Qopr3Ik@|^G(1CuF{ z`*z-*N@v)d$@xIRNiJl>j$F+a1Q%)88B+l^oySH9TJ{;UbkLv8X1-Vyl>~8jaJmOc z5%$T-cHMIj*B?mbt0x!$-~U>zc*p*|UN2XxUY0w#aENR= zF$(!ndRe@3MBse`FCNUq%(=R}%%g%dQ0Z(pV}vuyOf)JiK4(VpWJFWf_;<72z8R07 z*3dwM$QJ@!f&XrAzjESecoF>W?pyRt&;0-+yatKx?CQcraYSc!Qcy2(oDNyNf+V7B zJRn&KApTHOobF~V5y;U4o(G^iAiX**rB252C1r*i(cj}Ss{=VNeR=G3`~)%F@r!zq zod%w#WME>F<=eI1d~K06Wp3(~SFgl9cgmljv_J#^n~^E+$vi4=8L6(afb}P63j6~Q WNV{4PJB#Z80000 implements IFa res.init(); return res; } - + + private static final String[] textureNames = new String[] { "blockBufferItem", "blockBufferPower", "blockBufferOmni", "blockBufferCreative" }; + @SideOnly(Side.CLIENT) + private IIcon[] textures; + private BlockBuffer() { super(ModObject.blockBuffer, TileBuffer.class); - setBlockTextureName("enderio:blockBuffer"); } @Override @@ -71,22 +76,27 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa protected int getGuiId() { return GuiHandler.GUI_ID_BUFFER; } - + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + textures = new IIcon[textureNames.length]; + for (int i = 0; i < textureNames.length; i++) { + textures[i] = iIconRegister.registerIcon("enderio:" + textureNames[i]); + } + } + @Override protected String getMachineFrontIconKey(boolean active) { - return this.textureName; + return getSideIconKey(active); } @Override - protected String getBackIconKey(boolean active) { - return getMachineFrontIconKey(active); + public IIcon getIcon(int blockSide, int blockMeta) { + return blockSide > 1 ? textures[blockMeta] : super.getIcon(blockSide, blockMeta); } - - @Override - protected String getSideIconKey(boolean active) { - return getMachineFrontIconKey(active); - } - + @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { TileEntity te = world.getTileEntity(x, y, z); @@ -94,6 +104,8 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa TileBuffer tef = (TileBuffer) te; if(tef.getSourceBlock() != null) { return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); + } else if (blockSide > 1){ + return textures[world.getBlockMetadata(x, y, z)]; } } return super.getIcon(world, x, y, z, blockSide);