From 71fbf0a2bd997a61ea77d546ae48ea36e84593da Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 17 Jul 2016 21:14:47 -0400 Subject: [PATCH] New textures, round 1. --- .../common/block/BlockGenerator.java | 3 ++- .../blocks/ctm/ReactorPortInput-ctm.png | Bin 1737 -> 1968 bytes .../textures/blocks/ctm/ReactorPortInput.png | Bin 1497 -> 1584 bytes .../blocks/ctm/ReactorPortOutput-ctm.png | Bin 1737 -> 2034 bytes .../textures/blocks/ctm/ReactorPortOutput.png | Bin 1497 -> 1588 bytes .../blocks/ctm/SaturatingCondenser-ctm.png | Bin 0 -> 1841 bytes .../blocks/ctm/SaturatingCondenser.png | Bin 0 -> 1441 bytes 7 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SaturatingCondenser-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SaturatingCondenser.png diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 16cc1b38f..e5a9df04f 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -110,6 +110,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB ctms[10] = new CTMData("ctm/TurbineCasing", this, Arrays.asList(10, 11, 12)).registerIcons(register); ctms[11] = new CTMData("ctm/TurbineValve", this, Arrays.asList(10, 11, 12)).registerIcons(register); ctms[12] = new CTMData("ctm/TurbineVent", this, Arrays.asList(10, 11, 12)).registerIcons(register); + ctms[13] = new CTMData("ctm/SaturatingCondenser", this, Arrays.asList(13)).registerIcons(register); icons[7][0] = register.registerIcon("mekanism:TurbineRod"); icons[8][0] = register.registerIcon("mekanism:RotationalComplexSide"); @@ -119,7 +120,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB icons[10][0] = ctms[10].mainTextureData.icon; icons[11][0] = ctms[11].mainTextureData.icon; icons[12][0] = ctms[12].mainTextureData.icon; - icons[13][0] = register.registerIcon("mekanism:SteelCasing"); + icons[13][0] = ctms[13].mainTextureData.icon; } @Override diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput-ctm.png index 128faeb3ee71096ce069739611892cbe173cc9c9..081cb28e5e5a39539c32c2ab1f7b98ca7467d307 100644 GIT binary patch delta 1335 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 delta 719 zcmdnMbCY|5Cu8A6uRc{%-DCqJLj`k7JwsCyOG85)1tSAPV|_ydeIrXnA0V5{6J}_=c9P}`Vzeb+v;~s$e)!t^WanK{71^Z;g=%4I4>WzUhQ%7 z)Knd@{$nbB)91_o-!QN4|JLXwQ#Qn2&3YSCS^JWC@>aGBLDsfB!5k0k_A854p7Du3 z^O@&t#E}!ecXb-qUhL|*{qXfBm(}ZoYY9q2|<;TCcZg*+@GJa2?pBQ+t2$yT5h(`wl;BU=Ock z+qcm%eW3@pW@5~Oed#+dFn_gRG%s1Vso2S}$8WKz!1g2cd#*Ws`NA?|`Pvh8K@0Zg zUS3ywpr%Lh?JmBQ35?g)x*WV#{r^tWqRhLsH3cc&uHWvp`rMBzdwgi$Zzf>{@h^XW z)fl&AWcR4b-}<%rfI@3FbEr&H{_T*AV=kVDR@@ci3R<(x#$LyD3!n4aef#%|PMosT xD2zkcZ*`pD)?2w(rY(`vWRCB7>hhmeg5lAwqFR+#A!itXz|+;wWt~$(69C){F%SR% diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortOutput-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortOutput-ctm.png index 128faeb3ee71096ce069739611892cbe173cc9c9..d8e53759a93c176d4f415af4ec8bc5ed8f17b5c4 100644 GIT binary patch delta 1401 zcmZ|HdpOez9LMo3JBM5zPN9ooE+=ir`2Bu-ZH)S`gv@0WIiY7M>3HI zf*{V3Vh55C2Z&^gg8-0Z4^ZqufCzw85THUpzB*2F4b7KCq4C0_K0Z|61-j6afKRjk?8xqk`O-3J-XL^eY z9Bwpu!m4V{kU+i<$+v5TGJ#kv9r;U|r2&6;Q^Zr^xa%JS+x-L`G zVl(<@tNa1@T*e6{nljX-V4})_32uFt=bOoOUFqpBt(u(OSE zE%ahL@9?EcwU zgEqxtIo1IuUes*0!N+vY9v}8sjH(E|gV*(2%c04&D1u2R%&u}=GL|dZnyYI?K`Alz z{Xu*YBWMeOa|27andzNts=8bD2Ghf&{-nb@MowsHXl=A!o0{T^KkauY7v|%`<-`1h z-CnO+j%R8c`unvvM}`#w@Rp~lB!A5bU+SDPxawvdIWPjRm->7P=%Yqg=neLH-F^_Ew>>>)qeR+dBEsgBoqt;|+XNqVzbe`=4MBFj)?ofh3%ksxH;i_|q z#U8Ug4)WKUBd?NjX<8jwMfx7Pn0*62<-tQWaCWKk>R=@JYAYP?TI*sJJZ>U4#>+(S z9wpqoq$|%=H`P^N-j|xbs$Nm8X17(2wkONfCPGC+eTek_FTy7rJ-4(8#v;z}%a>_% z>wdGeiL;9-aRzDneHv^V%zq#ALd_qN8`H*D)b{j4UaosxByEmU^V_6~K*o2;Y(`qc zL6uX3HSdxpX93q-FIW-tMH^!u<_tc8#@?jwx|R_-eA3K&xuPmmmN}k%%hbi-hT`wh zg}#8e{5(d^>7kXx*K(b*@vH$lQ5f7qKjJNdN!< delta 1104 zcmeywf0B2CC!^v-uRc{%-DCqJLj`k7JwsCyOG85)1tSAPV|_ydeIrXb4NE9BNuZgGZQmY z6D5U;+yY-;E0_G_(%jU%5>FRfC7_62N@j``RIe#6y^~)u87M#%8R1l9$t(j?WQKWfuJXrY7 ze0=!t-KW1#C;oZ+cCJ~}^{E$^z4*4fQ@3D2_V-2ev{LJLyvjR2?7!41BR9QC_=sGhDckdHw{;ioj9cHHct9?F+G$lg z!9xni4sl1?h@EN-*jZ(C_idTM^DkdSzTCVinek^`*y_)pKR@|#!BxArzE|Vp;>uLr zJHi*YdI>VMGsj*(n`ZnZ*KYpfe@BxTnccsOzB;1mqR`#nGlf&~LK$DZf_;0*!FY={ z^9`(p5{D1TF@9^@XgjaG(RA@z*B5OcRTen&J~*@Rjf1>hDJ8EVRz<%-oC_t`b>7u{1<8}BQ?l4Y3K#D8zC^(*HqLA$qIG+9vE za^~^HX}1bvw%M|6blfpZ?6KJ6{L_w0ibOhgOzL`)c6CzGi%mNFTs!36zdz2oROJ&( z{qbWz-_3u%+v9WWiH|y+BK2-*y{4|0n16=zzu~ssP?mFg)rMcMUcHjH-EjVM?YH|i z+c}uNFdUOvFJDslk<0ePnO;! zH)q%KiQMTEYrDfd9S=w!DT$h@SP{}9CvDn%{(3^Qk6ko>(a#)PfhC)NY`@CYT3M1hvv+iWApN$#e8?$2h*z>+&(V( f@_zPidnO)+vWL4@L}|!9U;qM7S3j3^P6ULj`k7JwsCqV+=Yj7*#@j0_E3%`9D*j(8v{Nl8L3ciJ_B=k(;xLrJJFNo8@F%W*L|w6P$`_nVsr4s@#oZU|>r0 zba4!+xFr*GGfN~;U~l#Jx3`TWO+3<6IMt3^T)}V0rSz}GUdxWtj!Vi!ze~-qlatNY zEpghtcVX9OiJ08IP`b)*Zt;tZ>dD3DESMEE8IwhvRC)xREPW$djGQ>_7!}+Ef=-?7 zEmhpSZspb>ju*GuX30Glips86DZO{~TDsTK2j}(HOQ^``Mku+?Gmq`w%oSV^-kRnl zab!wPuxL<#Q|ly7rNc}09;`ZGsp)I>HtPA~lRvNiJUTyS!@AWKX*Ed>3%`1D^j(+Qc(8WkPAe$CgfOEO=daAE4_J>xDk_q(0OVrB!WCau%w)79tu)xW5-e=fsux?AZq z_j^U1kRwV0PJha3J|=$u*>#4GkFV|U!wi!{{a1bV->>}k^hbJ6-=&V$PYVouUQE(X z^*YS5?`nd9ME~&e7{K9pvpWL5M|9fv$WTc&q&5^_% zOXi+aySzX8uyrHXm7*G3u@fDxcOGfCe>!xhEXAnO^doBQ&M zQYzOiPZafvyGHxRe*X54JNL`If6^_91=F^?U?^E9ZkJ$}CGC|gbEJB<^t!c6PR*~Y zZC_ix`}VndGbcTs^E>BVomw6@L1a2tW}}DDt83!N7I55-E*Df-DA;t?T7A=;hWKkY z-?uOYiZQu|-Mi)VdV)uHXBXpQv$q|+o(2zZdkM5>9t+^+fBEB4c*BYv9Z%$sRSF)L qcnA0V5{6J}_=c9P}`Vzeb+v;~s$e)!t^WanK{71^Z;g=%4I4>WzUhQ%7 z)Knd@{$nbB)91_o-!QN4|JLXwQ#Qn2&3YSCS^JWC@>aGBLDsfB!5k0k_A854p7Du3 z^O@&t#E}!ecXb-qUhL|*{qXfBm(}ZoYY9q2|<;TCcZg*+@GJa2?pBQ+t2$yT5h(`wl;BU=Ock z+qcm%eW3@pW@5~Oed#+dFn_gRG%s1Vso2S}$8WKz!1g2cd#*Ws`NA?|`Pvh8K@0Zg zUS3ywpr%Lh?JmBQ35?g)x*WV#{r^tWqRhLsH3cc&uHWvp`rMBzdwgi$Zzf>{@h^XW z)fl&AWcR4b-}<%rfI@3FbEr&H{_T*AV=kVDR@@ci3R<(x#$LyD3!n4aef#%|PMosT xD2zkcZ*`pD)?2w(rY(`vWRCB7>hhmeg5lAwqFR+#A!itXz|+;wWt~$(69DBNF%tj) diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SaturatingCondenser-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SaturatingCondenser-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..c1823f28314fb547eb7ef198204a96edf6466ce4 GIT binary patch literal 1841 zcmaJ?YgE%_7;aHPaBS$osi-VQoiJ^alv3IXVrg0_$VIG($h4tNX$Ea-8l(lMAUfqD z&dGEN^WeOJD2k2)icG{QDu_;026(@)GZhiMfGE0@i`x%o&iV3P@;>kLUh}1e2G4PH zaB*On-6>lkjsyx)#(-Nj7fXjue3pVZO`7=^PW8ZsIO6nZQM55qByW!ZV$ zo5dPJ5XuNTB51ByP3pOrRfcQU8yPf<O zD(~lFc0Qnvrj23Q-qNw zNCRNih((j}v=7Kw+UJ7a7!>qDvBA_IC?;f(88bo%7l!nDt6#m+COQoN*Nj1>O-hRq zhr)0Z8BeL1d}t>RfSK5RoX9H3SR)Rh2qr0597?L=^|*mnpgth;g{vVnVv!obgz9LF zgR3MCir3jxd6?!0uOyCDgFp5*ea$F;)NIlRSVlgoYJ<6Bx1PCl==y_Jtg#uV2L8W}uOC;jUVGpn$s~IG0 zeOLtkUo6BJ16k|iKlL(j#1x@*`Jwum&4>QM4NTKeOn0Ccex1NH-4X>VQJR}>ga?I; zN1R@oD*~(J{BnELO=jHLuz&0R(pUT14<+i!gIA@W$^6;r=oRM<$5DAti&|$j0}l%e zk5?OC(RYf8VOR9$pgZ zWIrkIk|;sV$+Am5)%mXM*wLGy(Ap zBFoEvA3NC8{Gf4NgTlIpb?%GG1pCF37(d7i?Sf zCsBIr^--reV-j`Ex*7hB=Z|IB=0@cB#*Ld~aHwf17M*)uvMjUevL)2%Vb3hrgy71mAx|zouLYhxWQRMh11!k7J%e$xZSsqn>KQ&&!O5eC;SE4Ww2 zn|PFREn9tgZdy-I&lJVsOUOCrjl*wvH?2RiG=J!@b47~E&WqoagcaOrJ9UbEy`dxT zrr~~7!L&4GWTtIuqvn?qQ={{5_#vC&)$+w2U*-kJ#Kp5*8p2hk^6kC``&G9@YbEVZ zFHS!>zO`-l!SKh$&J`p-q`+(Qw|k-mIhKkAT>(9}zw+MmUiztbc|qyb(wy#qit>U( z$`vzPx4#LAtq0FVQQInxZ1Qe+p`X&Yzpl9fLY5u`iQC6#t$6n+TXtpk&b_jfF~ba1 zTX8pSeX^>vJ-RAz!lfg%CAS0ixK!uF{9LEwgX42cI@#TprW*pgsIPmTbiUCYc$+q( z@=R)VP37#***QsvDRY<2W`59nrObBA(|gU2U#=Vhv(EZup4mQj)LH8#rjP}rMSiN) F{{Z1Y-0c7W literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SaturatingCondenser.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SaturatingCondenser.png new file mode 100644 index 0000000000000000000000000000000000000000..20c6ae1f48f6d0f9c6bcfafcf9ae644a6409c697 GIT binary patch literal 1441 zcmaJ>eM}o=94^~5$cixC;$X`>4%88C@2>5YYe&U$ZAZt-M=2j7Q;+s7+@QU3cR(Q( z_VEXhvEj&=k;LJ2#0}kMwuu^s7#)#GD2o{&FsF?9O_*7LDbDFzpy(gCOYZ%;=lMOq zulE`<(zb_(MTbcwl5lg1!3yWdz#F;>j;|grR>LVuH0Fs}oKvi1cp%X`xI%!KT}%)8Qb{Ql}B&%80mM7*}c53aMOU?u^a<9t+*%C=&lGnr7OMr+Jf+E(fLvMBUpa|>G zp}C|5w|Hn!%%)WHAgemfX0I->YaD3Ovq+*>3k|q{$RJ)aXfdp^vQl2DlyiI$Mrbq|3|C+Zg$yEOLX}%&yfU{C8?;~mf}LkQ zBFnjvfJLT|D;ISr^mH);fxKEVealP6aYeRwCOwxi^7x|ID5GZxJ9!;hr%y%2kX!(5*RgrG0R9m zB*-Yc3JwXNP^M5(g-%MPNl-Y*pq-WYM1l#|8x3j|O(_Y&s7|Jg1ZB|ZNj*(dCQWjX zYjz7FfY&1L* z%|8`#H8neO=4ixcEt_77J~c5$M;LcEH$U0VUj3t=a~}9^PsH%lSj}Kfr|;hF?Ci#M zC1m>%A!n%I9PuD#!moGa82NaA{y@mb8|n$%a( z=9ajj8`pdrEVJ(OQR|h~jQE(TerbC8cwJrX6N=MM&t1uB{Z;CFGj=@g+CdZNRBjCW zw9%aE&lI`}n)mF?xR?FV_?eNvzuDi?8olqVH0Dxg>iJsVU9l`=OXJ}6rui*NQxndf z?VHq@<9pY{Jv{Nl^hi_Nx6j><`KV*fZ`Ls>b@J;+UY|NX{rz8cO?`UG+jMkxPhbDX zA!}dzrTg*eh~F>d`HI$cnj7j1O1nUmdZ0`7Zc9hc0~;k}lW7qbW|9vDewt=un&C|H H%lrNTj(-zW literal 0 HcmV?d00001