From 4f49f7fc65363c4b6c3664ffed097905c2556589 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 29 Jun 2015 20:55:06 +0200 Subject: [PATCH] -Added Lamp Colors --- .../blocks/metalists/TheColoredLampColors.java | 8 +++++--- .../textures/blocks/blockColoredLampCyan.png | Bin 477 -> 378 bytes .../textures/blocks/blockColoredLampCyanOn.png | Bin 554 -> 493 bytes .../textures/blocks/blockColoredLampMagenta.png | Bin 540 -> 518 bytes .../blocks/blockColoredLampMagentaOn.png | Bin 625 -> 606 bytes .../textures/blocks/blockColoredLampPink.png | Bin 402 -> 471 bytes .../textures/blocks/blockColoredLampPinkOn.png | Bin 478 -> 521 bytes .../textures/blocks/blockColoredLampPurple.png | Bin 544 -> 489 bytes .../blocks/blockColoredLampPurpleOn.png | Bin 615 -> 600 bytes 9 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java index 303c692e8..dedb26980 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java @@ -38,9 +38,11 @@ public enum TheColoredLampColors implements INameableItem{ } public static TheColoredLampColors getColorFromDyeName(String color){ - String actualName = color.substring(3); - for(int i = 0; i < values().length; i++){ - if(values()[i].getName().equals(actualName)) return values()[i]; + if(color.substring(0, 3).equals("dye")){ + String actualName = color.substring(3); + for(int i = 0; i < values().length; i++){ + if(values()[i].getName().equals(actualName)) return values()[i]; + } } return null; } diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampCyan.png index 878f0c77be34735a107928c9f2dba968fdfdda6e..08a1e55b6a876a90600d2a302133ff9996cee264 100644 GIT binary patch delta 276 zcmV+v0qg$V1Ns7xDhdAp{{a7>y{D6rGa&~Q9Rjd^A3>2@D}MmqNkl{d|TB*kow{0000Yy`kk(kGa&~P2M!FXzci6sD}Mn&Nkl|QBLGQ z3`Ae`M1=j|0uU|d;Ql8;O6CZw3CpjsQ zjH@Uq-)&-G(tji-iNEuF$dV2Qy~rlAXp~T~q(fr*MM-cbCy5v+pXFe4Np|JQB?gxWzP@b1G z@%*%xd<{u7wT2Sl(-Q{pnYqYmw)vl|4_scflhcvYs#)=8%DPCM4aM*dyzhJ8y84N# zpcbg4Z2R5^P5}G5@@H9C^TNYVqgu3#%cpy{D6rGa&~Q9SJ9_#>tUeEPqi+L_t(I%Wadrasn|7 zgg-krcjRsILsBq#=# zW5ZZu?;$4w=?o&gZZ-_A{+sGS#J-pD{`dnTI6ja1_WVRqcpt$7!GUNk=woRlhioJs z5hC!hhSCz65P!1P;?RHqj1IPA!-kR8uoX#51c)=Zh?S-)CnM0tE^3mO?aV|S7l9C% zxKGjr)?YNwrV`B0vS>lnW-=GJdp-iCEP%f)ELF_PEGH+5+7kt5H{WE={!mjf0f^WT z`$;$7@z6cbtx#)T1PB4oFydX6t}UTglA2uYu#1{oJ!sRF*vW*NBwEP=Mg*{O<`d$o zs?7>t7jvD*<`CPr?+kZrR>u3f3zWk4_2u8Cp|iDjux`fMe;;7|h+}tB(i!5au5>AN lrQ-^wYiAHKJg3`A{{q*5o;K%AOYy`kk(kGa&~P0Ut0xI6#qGEPswkL_t(I%UzRAZrm^o zg+Ef(#ESwcGH4Ibn{<&0P@reaVY+H2$$1J4f_PJ48ku4jq7-MeF(LEu{Ya8;_xJAZ zu&%fnk`e&!j);u!*o*(D!n!hfDYzM*4+nOtC{Wx1$N?6n{qD!2r+8!k61yPRAqaW@Hh5?)Oxn0#_m^aITf&K9pn;W>tRN+%!eg zgc2)nB>uawKn&ffa<%DWU7Lj(K4(?TeMl7%vIyo*X(=*CPMvv@lv+c8I$I6E<=PGh zP^Kx0_lB;hH`lQ9>4F_#qSnzwq`qa@DqA;pdyl%=2Y=srGhmxOz+0`PI3aV#%|56Z z0d;?~>Hzm#&b6{rC5a#@wGjK|*@l@z{yA9t-dnBw4b?5XTFG%-Jxq^59qds9gT228 zC1m}2c^UV-gSrg~-`&ddvNS@~c9E9HN4_2o{C<5Uhu1z#Bl#ZStZmevhX*8QCdnB} v;q>%`nZ+{|U|snSG|v2|Y+k3u00000NkvXXu0mjf2jJIR diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagenta.png index fcb0d50f150011d3466b824870c52e0f61959300..c405604af4e01704bd39a2e758972d3474d9dadb 100644 GIT binary patch delta 417 zcmV;S0bc%`1cn5VDhdAp{{a7>y{D6rGa&~Q83NQ2+C`CDEPrZAL_t(I%cYaOPUSEV zg+F^@I~4bdW+fyVYC0%+f6=kk@(xHeh+?^k<1vNp;ReyHcA89__{{mS-Sy$7@*g#g z<`9oKJOC91*u8)6-`BS;ln)&pnF zeyW8iGu{cSo`1+C6C|{0E|4T~fAxTK4xsY_CLe9eT2Aew6VsZenIM5EbCXi*-h)k7 zk|c^MMYW@Qf&_{xxn^_i9C#YW44q?|)&pYY(Hm2rd zyk~O3JW12M+Yn{u&+C&(aN{-}T+W|UEOLalXwnE+e(*ZKt6d%GD6e+kV10000< LMNUMnLIPld_o2lS delta 439 zcmV;o0Z9Ia1e^qrDhb{I-T>Yy`kk(kGa&~P2q;-UCI*pPEPsGWL_t(I%YBn;irg>| zgul|mY+%VP@)#I~-2WJ1*~vLVLN>Og+8-@j*#u$`jk~2%b(LCQ>dgS14mL>q?@JtY z(dm@q;K%xbMHL}-?*J4P0Cw+WWdNERS(&Hp4mJhgQa{n?ET11BLro9R3<8p<&2edu z@az7QYrXKa-G52g6crwC@1tr^B@S;6pfYG@po(|5M?8v8%Y4p<~vL?-}89iJ{0e{xqz@9DuuqZYhT`h{k8rB+E z4OQ{5BuYYL(xA>1vj{hzx0(UA8D1O=juwi_q^UoER!`v7)1fryA_4sN%8#$#L%gJT zas98hhLEbTKEI4P5xUi@0j~8zbEBwWd=8Be#;o4RBuXy0d(1(KchKoPZ{O(n9O;DO h|M-slJ{a?z&MTjN!3n~P(hdLs002ovPDHLkV1mP=%Sr$M diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampMagentaOn.png index 635dd1a0d3643dc1382dc2bdad9b67d4ed961178..187ced2289dafef9be18b2e3935537fd5d1ca4e8 100644 GIT binary patch delta 505 zcmVy{D6rGa&~Q7%&Cix`dHiEPujDL_t(I%YBn!Zqq;z zg}<4#YZFIlEA=L=Kn;Q`a09poh0|~W#2G+piqxYZRV|5|WW6)|*m#p5gjbel$M&1| z-t5Tdi%$+OASEuNG&zD{UQSZyn6AH zRUzAczfuDR_Os9`kH@aDtY{84nmX+UZr{Wg4M=rq&T zR?wL;fB%|_3Oy906D?KJV=g7NOE3(7Hgu-2^?U;oK)Rf>os0lb zNvT~aO7w^=ZSVA1fWiOS1>1oi0gQA#I-ar*zA`+4o`2-LbeX>Ob_7_BfyX`VLkVLC zM8Ka72FI4hz>t|3M)FizB%NYwFY)+v2V3UWN-bG7c6{u@d2XMCgMFunKsXI}bkajY zr%Ej~ie?XjgiJSjF;l0CuMB�w|qgPsZ>o5k2lDG}08BQVX6k-Sm($aDw!>1DYy`kk(kGa&~P0yMYLlEaZ(EPvHWL_t(I%YBnSkJLa6 z#eeq9Cfa0|EolG=@wF(RI;v~#Dn0|%6`+;)YBWexCjoc+Pm^TE6wc0aLL$w0tUUX@ zXODbb-x$Eah*?2I`QH}_04U19NIV1I_iuToYk~xhcFDkuyafO_-djOCvW2vAk#YV$Mrz$~^rTBf8 z!A3!aAZ}(9QIaL>VAW|^D-^@9f5$M)xtV)xSe)krlYdK)$*_}oyb$+gDacx@p>?c< zQq4Ql{#!x?C|ELQb}(|zo}S1g8|sK;DgNUe*Ry~f3PgeE`(RdhvUajjh=PO}xCsu{ z*_R3Ip&-4|N{fgRBY{>L2TfMZlwPn?q3p|CupmpJ>V5@GJl3`=@W%=&nmE7f&`9z*)+}mwP(xP}JW7!1d~iWQk5YvgP_{ zf&{W<9?Ona8oH(@j}v$MEe#9bgMpFH`>#yo`lKU)iChh?`NJhYF!Bdr(*b>=aIAj- O0000y{D6rGa&~Q8yRdtaVwEqD}MnyNklTYIC68*h89*2Q!2G9V0d0w&4r67qu0mt2rN#bd*%k%WSs&6*BwF91#)L)x)~=-|-!EyW@7Ozy#syQHSe{3xQ= z4q)+IVcCqU1huT>BB$CytHO;T>R7X}3i9l}r8bet`%@j$b&xy9*~p=dO@q6{dntd~ zxaN?}_`F_Q3HG|*YX(lku=;2SgVY59&!zmHyIS9+l%}lDczl)9%6Ccp0II&d{Ku{w Q`~Uy|07*qoM6N<$f~_pQ`~Uy| delta 301 zcmV+|0n+~01Cj%fDhb{I-T>Yy`kk(kGa&~P2R0*YDL1q{Vv}qHlJs%H;JC13FzlIs$jt#v>;PncSaoKyU zdB57V?f^gp1Hk1HmuBH;Hf$gg0l@nW+-^XvAlxJ9ejiR5BxfgqQiiV?IB^nyGUg#r zj*vk?fu#&F1%FD;XUo{8QggOH2anP-1*x6IBY|x@0Z>3LJKMQ3+3Adv1}cC32U=HP zckoB)OoyC7^g80`2%H| zpU*-e{q55R%G64UwbmU#Tx%UlpSASaxjVkAo|CuTM-G{700000NkvXXu0mjfX|#w? diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPinkOn.png index 6134821a6ab8ed74e6020e69ed9ab543f92eda94..7e823abf87ff08c7a8c7ee41efac24ab00f74be2 100644 GIT binary patch delta 420 zcmV;V0bBmw1BnEXDhdAp{{a7>y{D6rGa&~Q8w%+EF!hmJEPriDL_t(I%XO1UP6IIz zMW3fwAvp}2903rD#9@&lc8Ht6A%ITfp;$PsI8CtB^3XN>`oGG2>~=z}NJ@}1tX5Df z|1N6*FwP+<;bop7XKwEAG3#|R%DL^{pYMzF*Wmy;W8QCXWpj6jq{Qao0TTjPi=>2c zPS1cM`+j|GL4RIeu>Aah_iUe@0FY8JF=Cvf9*-?h2n}`!m>AhSK57|OYwHkeMdn!z z`Z6(s_iaBdDFv^$oZHV@&m>ygvUidfL{clB)e3UHFzA8IH5C>L*$z|To)Ab%8dOTb zgn->{TXs8CE~TiE!W&8$kx5E_%CY)zaxx*P!N|V$fPb|OZO)MMphB;GfM{Yo2Z<3W zr77gSeqNbAK_9bAO3k4M3;~&EWSSI>?LDBGoI8`)oyXqjC@(meCO)5^8xMo_*BnfY ze80W5q|UWjpjI~f{nepS1*S<`SxVvSaA^0B-A*osr8_R<>@%}`{{@&p;Box|kH`Q3 O002ovP6b4+LSTaUro#0A delta 376 zcmV-;0f+vH1l|LXDhb{I-T>Yy`kk(kGa&~P0tAr=qHmE~EPp~tL_t(I%XLygj>0eu zoVsq2cn=pO5RcDKFYMFfyD5CORJ{O>cXXU=fU zGZT(SU>N8~i9y4_GbNz!X)g=y#{-Cf!;Hxhz~R6SHguR(8>pSVUcl)DOcM+_v(n{K zgT|4G^UP#-`hVQ%JD&@<6>e%Vf{86((dl~vC@unCF3Upa<|qIfYCG7jqb~vucP5Lc zs;%qaTljjnUu#h}>q@|Oc<#V{&+1)Q0KBx;w%yuoXDL^47HMGkTU^vmo_A_vV{mD z-fj$RcQ5c(P~!-^-{qYYr0wUE4hd`HS-6`4yB&ey{D6rGa&~Q9vKlfg>I2sEPqW&L_t(I%bk!x@w-QC0Cgb9DVxn#|S)?7Bn{)3pa=LqAM&Z9> z@Xd$eh(RJEf|&szA^`Qh9h-T*6#zIMR?L<--@776Kt#xvQM5h-b$xz&GLAFeg06>(;s3VvAH?^jY6t*yA%Op!(%{K=LM2Q{E;2twGqmGza zmqCz#nUP3U%&k>{R?$x@6x8%bcx4G)7kF(|U8qpVmaAx?5G1gpJLocN8^0?%vRi1$ zeiK)K*-|Y83EgwMdTU#P&ZM``1M=kCT#}_)s}_dkLuAKmNv1M&By*X0xA&gF+vQ=J zS^Xb8lc`MG6Lsha6d;v}`Yy`kk(kGa&~P2Lo~&!-njg7keI|Y0%Hsa z*2;`yere|PF%$PM@1O@rkXacKwPsdq*BimlFy)A5-Y6o0xu?Pi=i^b=Q1#RYAK#K)VR-O6+ z$i%z0`2-v)5F18tH#UwdVIB~Taok5T!pe>7+pZqCI3aQqH1N) z7sm|T;?_cXCV|s+@SICYBp0^wNT`_YO<$-8uFl}nl5rYU$n}&5z@ORyC+5c>433oP!() lp*hqb#2g^ke$IUZ{{ikK)hZzpYQO*h002ovPDHLkV1i)~(3=1N diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockColoredLampPurpleOn.png index 34d5e65a6687d4b768ed2309553f8ca8e34e3d1d..28e1cba11b15c5a1f83f3ab9e34f8402bbe3ce8f 100644 GIT binary patch delta 499 zcmVy{D6rGa&~Q9wk0m`RS2cEPuR7L_t(I%XO1MZqz^! zMPF67F&=?n#R?_S5Qzm6mto0{qae1vHVz?)og+V~-`UWT`B7 z{rdmcZ~JimML{4505hBGe?4Y4*OJIZ1%R_>Tk=E4GnAnMq^2G&gYaZ1YLh2pcY6as zHZv}sZz;Wa`G4jy-WcYf5pb581^D{Y9WO2}`SxRnOCmMK>vvC400GU$!C}}38o?(f zsWozEyn6ct%N5j*dQ!X49rm%3Ac@==xiy-NV`jvm_GJJC!~t?Q>5K_I8J6q!un)|P z40x`ur0PKw5yRqq?u-~ASZ_lTWnjfU&wm|MM2ys_BY#8@sWnuDH0zHl|wM>WAYy`kk(kGa&~P0TVg)bZe1YEPu;ML_t(I%T<$2j?_R5 zg+IHTq^E}kXJCg|jKmJ15gY-{84x>8!xfl&AR$1YhRqy=#r&qaVzY2{dWaM`aaBFP z_w14#7vTgIr{RngoWKbbStEcG7z%(PR2+L?q2auFb_OQ~R-iTj7%gLMnRf>du)?>i z-!vTg&bxT^{C^DQ1>V0VCIb~{3#cBy0hu#$`4g=0JAx@uvZ6eha