From 7bed0a622790408c6c6a12703677ca20f397d987 Mon Sep 17 00:00:00 2001 From: Adrian Date: Fri, 5 Jun 2015 07:44:43 +0200 Subject: [PATCH] correct iron/emzuli/clay pipe textures, charging table; use one weird trick for better pipe rendering --- .../textures/blocks/chargingTable/default.png | Bin 959 -> 971 bytes .../blocks/pipes/pipeAllEmzuli_solid.png | Bin 243 -> 243 bytes .../textures/blocks/pipes/pipeAllIron_solid.png | Bin 147 -> 228 bytes .../textures/blocks/pipes/pipeItemsClay.png | Bin 415 -> 479 bytes .../blocks/pipes/pipeItemsEmzuli_standard.png | Bin 223 -> 223 bytes .../textures/blocks/pipes/pipeItemsGold.png | Bin 224 -> 224 bytes .../buildcraft/core/lib/render/FakeBlock.java | 6 +++++- .../transport/render/PipeRendererWorld.java | 7 +++++++ 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/default.png b/buildcraft_resources/assets/buildcraftsilicon/textures/blocks/chargingTable/default.png index 24eaae82388343fc7810791fd701d55770b7665b..a4c8343559549197348b408268c718c0d2148291 100755 GIT binary patch delta 902 zcmV;119|+v2g?VLQhx>o1sWJKsG+U^00US_L_t(|+U=Rma?>yn$N!2Hf3@TQmtH#4 z1N7350}S+S@(w%$55PP0Z5W0V9GHOxKoTYF?T0sLV}}Pv8e5o}%Wbyf+t05I0DrXBV2riiFHGQliEDD2&eg5*X zkpckVQ#J(v4B5iz-%6H(Yf}SCNLJ3@Y7H$a!)1;RNs3fI1kp=~4vm*MLp?0CsYG zu9G+}gIzZ_>0mcPrVlXCZ0Xx(RA69anS`3lvJYt0Koxy}X@s^)0b7nu=F4h;F5csuuXcciIP-p1kSY6rDOH_=+&#^4I-Z1=vAW6rrWl1a*E2gh9l@Fn4@9 zm1r`rI}-f|o+yZ&(GT8FDgS{d;Gr}6!FQzqVSfkJbnaW-ahYW!cPxVS$9zpSkaU(h zqY2g@w>5The6DeiP1JRKei5sCk`uh|^ax$=?{k6K4!&Qs?fOdT2J6${F6?Kfnm;?c zXeFKNbiC8l*^Bop9pAh6i#EQk|7JgXdinzUdkMzZlRF2%_`Qk$W`ECq@h_X-H~9Xx z^?%>27XUV*xASUkJv;b5ukznclUw^u@GctxAOHk_01yBIKmZ89{rx>)*AF$D+7^B? zQUC!U00dxZfvEd~gA_mj2mk>f00e*l5C8%|00;m9AOHk_01yBIKmZ5;0U!VbfB+Bx c0`MQ&UwzBSx3?$jQvd(}07*qoM6N<$f}CfdL;wH) delta 890 zcmV-=1BLv{2fqi9Qhx&w3oHeF3t80w00T@(L_t(|+U=RoZqq;z#=o_9W13V!m7vF* zatKn8P*K~r$`f$p33B9(5aL7+Jrp5ToO-EJkrZdWSq{#)YiFI{m z2CPc(bgmtBpp!Y2Y&j~}96X(i!UH5$LkiV|>&*Zt2B|`ogX5la6;Kvr7|0wP_nfPM zCQQ~jT$X3<&42%z&a&r+oiQ%#}X? zd^!j*3Q`!icN2^PjgM;->kGOVd{Z~>Q$QBg?cKxzu>Ia(CHAZ9%Ss9WfQ$Gy0ALh6 zIDKO@fRsX=8jv~aR)#lH7~yt|m@~XBN-c zq;KLY7BSzKoRY2FywLRftx#dUhkswzo%+gB;iXQSa-w zhcUjc|Mb2%8J^|F-=_qC{NBcYdOs-p^842;F}n1tbsPWbysVQyf3;eNsx;@<`R}I5 zqjUYA;8QjRzyKHk17H9QfB`Uo=L;Y)+8%XZ+PW(Mygqt`eXYCr$qHZq41fWYnehFA zgB8F47ytuc01SWuFaQR?02lxRU;qq&0WbgtzyKHk17H9QfB`T72Jj!+A1-wQSe^a3 QdH?_b07*qoM6N<$f+~@o!2kdN diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmzuli_solid.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmzuli_solid.png index d44225c935ba743cdffdfeb60b8222b98ec59b01..b503885c3d9a5e7032a290c5ee3a7cc36f2e9364 100755 GIT binary patch delta 168 zcmey&_?dA+a6K!lu*wj^r88{~o51RsjX-em{e_0rLTnQ-1^xDGX^c@=yQ(0DwtEK~y-)V`M-B{&Rc(ORB5D`Ok0OVSw?U z-@L=HF}au#Sv?a29)PSF7hs}9Gfo4D)y%-az`*D~xA#8-1%L%Tz!(@9Faio!0Hb(; z6lY@?K(6NJH}5boQKDH=U4?;(63qk?5;0LsaWpa#6IJ-4m?4QAXOm|8-G$*l2rk&Wd@@jkv%n*=n1O*?7=#%aX3dcR z3bL1Y`ns~;XJcg*7yNfC-5n@Y=;`7ZVsU!u+b=p8HLQZoaF*nq_i_2Cwg zyN!3WdO9g@nCYne;gjOq5Sev>Wvga|t})M+ms}IY_5T?A*=kqkhpRvR0ou;s>FVdQ I&MBb@0L!;eGynhq delta 130 zcmaFDIGJ&RL^TsL0|P_ST=7ppiZj3`#1%+y+O%ou(xr=&*k%Jcj3q&S!3+-1ZlnP@ z7M?DSAsn)-2OSw340u>JeEGF@#><1uMQt1*XCzhLxL*WL--T@eh&bk7akYL01ysGuz&UinzjY2*5XuhkqiKx zPG?Dg%J;849y=IMTnHklssc^hMz8k?sY*;-7n-&SArv@{4F=(B&_{eHj*;yws+B5D z_M7NMwcg@D4+=(uPmdGC><00nDC%kt4D*T8XZtkuAPDXD`$BA(&x}mA#DDz*FRnB5 zTEl!OV delta 341 zcmV-b0jmDr1D^wsQ-1^xF%xDXXZ!#F0W3*GK~y-)l~PSlgFp~{vkMdw{*S4LMm?A| zwZV_yS-YU7#zO@U8h=g?)&lL02Q322l5}pnGjHb2djqs0et6^h`#yfH-YUtsT`$@n z%uVoZbWZ3AVM}y@HEW~JF*-_tMV#_YbY@H@m}E#L8Ee*%LVv>d18g>5@Ph#B^%`Lq zqAUt{g8{bNZwL}#a8-vc0T*$~eQQ}Yn5z{>vl010fMddG3)V@^qJc^>c9t)nJh?on zGOp{{EffEyJw1Q$bUY+c2LnJ+`1xop(^5ViU4%F{vbDAtlPP01?6S z2H2G)9M=UAAx_V?kU~Q1-y=HMh-0kkv)JG(g*3pA%Xf}uBkDS3b75*)HCHRXnw*l& nA)~>5ziWW+t}m*NtW5?#ixZDph65Ms00000NkvXXu0mjfhclE@ diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmzuli_standard.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmzuli_standard.png index 1ac71188027c2c8397d2ba01cbb7dba665bb309e..a96ca11e8a3fcfc6d59ae8b52e19bddacd52f595 100755 GIT binary patch delta 69 zcmcc5c%N}Xuo^3?Fn9WuXiEkLh8#~9#}JFtYl9C89#G&p#B)v1$ld*vjI3h!(utKp ZBInY=s-AtBt_)Pk;OXk;vd$@?2>>Oo7t;U$ delta 69 zcmcc5c%N}Xuo?@$oSIVK>`e>|3^|@Ijv*GO*9IRHJfOgHNN0wkmDBSR9FmKKmrbk; Z5;0&7`kQz$;}}pSgQu&X%Q~loCIC757ykeN diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsGold.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsGold.png index 0e36dfc46354b7b524f025ee3eaea8d411c8b233..00b04d24e8c5d24a7c9b1c288b45a5504226d0ed 100755 GIT binary patch delta 18 acmaFB_<(UjFb6BEq}kEn|BEI@w*mk^DF-nC delta 18 ZcmaFB_<(UjFb4~tp~4O0oVydFTLC?C2G#%o diff --git a/common/buildcraft/core/lib/render/FakeBlock.java b/common/buildcraft/core/lib/render/FakeBlock.java index 4d12a56c..5cf910b9 100644 --- a/common/buildcraft/core/lib/render/FakeBlock.java +++ b/common/buildcraft/core/lib/render/FakeBlock.java @@ -41,7 +41,11 @@ public final class FakeBlock extends Block implements ITextureStates { public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) { return colorMultiplier; } - + + public int getColor() { + return colorMultiplier; + } + public void setColor(int color) { this.colorMultiplier = color; } diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java index d33498eb..0e839dad 100644 --- a/common/buildcraft/transport/render/PipeRendererWorld.java +++ b/common/buildcraft/transport/render/PipeRendererWorld.java @@ -197,10 +197,17 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler { stateHost.setRenderMask(mask); renderblocks.setRenderBounds(dim[2], dim[0], dim[1], dim[5], dim[3], dim[4]); renderblocks.renderStandardBlock(stateHost, x, y, z); + + int c = stateHost.getBlockColor(); + int r = (c & 0xFF0000) >> 1; + int g = (c & 0x00FF00) >> 1; + int b = (c & 0x0000FF) >> 1; + stateHost.setColor((r & 0xFF0000) | (g & 0x00FF00) | b); stateHost.setRenderMask((mask & 0x15) << 1 | (mask & 0x2a) >> 1); // pairwise swapped mask renderblocks.setRenderBounds(dim[5], dim[3], dim[4], dim[2], dim[0], dim[1]); renderblocks.renderStandardBlock(stateHost, x, y, z); stateHost.setRenderAllSides(); + stateHost.setColor(c); } @Override