From d6faf9dde6af6641c827611118b0ccc41d21d5df Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 29 Jan 2019 19:55:38 +0100 Subject: [PATCH] the retexturing, part 1 --- .../naturesaura/packet/PacketParticles.java | 2 +- .../naturesaura/particles/ParticleMagic.java | 6 +++--- .../textures/blocks/animal_generator.png | Bin 587 -> 476 bytes .../textures/blocks/animal_generator_bottom.png | Bin 455 -> 393 bytes .../textures/blocks/animal_generator_top.png | Bin 440 -> 522 bytes .../naturesaura/textures/blocks/end_flower.png | Bin 324 -> 386 bytes .../textures/blocks/infused_brick.png | Bin 324 -> 764 bytes .../textures/blocks/infused_stone.png | Bin 314 -> 790 bytes .../textures/blocks/pickup_stopper.png | Bin 526 -> 600 bytes .../textures/blocks/pickup_stopper_top.png | Bin 625 -> 550 bytes 10 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java b/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java index be9bb9d9..c396006d 100644 --- a/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java +++ b/src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java @@ -279,7 +279,7 @@ public class PacketParticles implements IMessage { world.rand.nextGaussian() * 0.01F, world.rand.nextFloat() * 0.04F + 0.02F, world.rand.nextGaussian() * 0.01F, - 0x5ccc30, 1F + world.rand.nextFloat() * 1.5F, 40, 0F, false, true); + 0xd13308, 1F + world.rand.nextFloat() * 1.5F, 40, 0F, false, true); break; case 17: // Animal generator consuming boolean child = message.data[0] > 0; diff --git a/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java b/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java index cd925247..69d19aff 100644 --- a/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java +++ b/src/main/java/de/ellpeck/naturesaura/particles/ParticleMagic.java @@ -48,15 +48,15 @@ public class ParticleMagic extends Particle { this.prevPosZ = this.posZ; this.particleAge++; - if (this.particleAge >= this.particleMaxAge) { + if (this.particleAge > this.particleMaxAge) { this.setExpired(); } else { this.motionY -= 0.04D * (double) this.particleGravity; this.move(this.motionX, this.motionY, this.motionZ); float lifeRatio = (float) this.particleAge / (float) this.particleMaxAge; - if (this.fade) - this.particleAlpha = 1F - lifeRatio * 0.75F; + if (this.fade && lifeRatio > 0.75F) + this.particleAlpha = 1F - (lifeRatio - 0.75F) / 0.25F; if (lifeRatio <= 0.25F) this.particleScale = this.desiredScale * (lifeRatio / 0.25F); else if (this.fade) diff --git a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator.png b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator.png index 74c81ad45d4d799f2f50725620ab5c9a349af499..7370a5f7596f8a82c64f7f97f30ad914a4bae4c6 100644 GIT binary patch delta 390 zcmV;10eSw*1l$9VJPN)501mzZ>O!%=kwzzfT1iAfR5(wCk}*rfKoEuRFIWUQ5d}Fx z!+GJjfG22U6U4(MaE(ps`~W+P!%74dD|-tY8-L=;_uz$%5iDM2W@p~pnaqwZ4~`-@ z-znB%O!>1E} zb-;&~NS++$F@zxd_3@%YEOA}evI7AeKoXE#KfMc0)AW4uTttmW*FQjs@ z7#?0l!V&}Wz66dsK;Y_d+7rN9#6*KS#_{M9@Ca?&Dp}oaL?pHa>Hp|P@J>lkK+;4y zz(1`~^ zbw{=U9CeTic*iEOMr>ZJ2JfH~@ZU_I@^l^qZnDogdDn2UwqPX=cn=0i`_!Z{fYS*8 kkCF=7cZ_un$g^?$0V<@y%#od`7ytkO07*qoM6N<$g4x-(^8f$< delta 502 zcmV(R5(v%liN-rK@f(^1idi|YUAjR zHUuL$n?(>7iKDw7HcN~eV`#ZNj@RbL$;N>k8a0NUNf zd_Ko?It5t^>UN7_yV%4>?Gh)_pSL%K1VE?bzKzG~v^o2?N*8CK$9pGA643d7 zIjGeN08`!oot`>1n<(9lVAji71?)@xo|9G}nTEpvu(pbL=bHm?Wigj*Of>@x`k>oU zt_7Jvt^&KghQw}ydYpm#kGHC@QLci612-3mqapu@IEx3=Y7u_4YgidSfqtckqa9eY zngNcu1s_L$|9~zpL3?{y1)MEu#jZ?$Rvhp1xAg#!x3`f7OB)3MJ3QPuhlM>~fxOig zW+2Mn0mHPvytqXV_<9GjPwvYD%mxqe{tk3uOKf*D z_}N40|3A?6bq477H7kuc1D~?)yZt=?mbz^$-TYqMfl%Jx^$!#P$H$=8S0_K@!@~fO scX5rAi3Sw_T#-uJ`wWmZOI(`b13oCSj?D6fSO5S307*qoM6N<$f`b_3D*ylh diff --git a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_bottom.png b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_bottom.png index 694b638dc0b3bec1860ec3d1c7403e6556cf04c8..588a0b7e3800961d350e63d702d3d6a8c5295de5 100644 GIT binary patch delta 307 zcmV-30nGl#1BnBWJPN)501mzZ>O!%=kwzzf2T4RhR5(wSli^B2K@diLg@RjXq9XT( zX$F!JK_r9({ptPRX6p={WxN&UkHgN)&VKvNUGCs@z9{fKY0I)1#%k^Eavb?@HS+<7 zU^|)~r9Ep7a?Vu;f;zXncej;X%RR&)pe0t=oHz9#?7nNcrwS090z#~g9^U{Z;3n{Y z24nX@cjh6WT?(!Um}mO+5Xjd41HBLtI+UjGFx zWgMw*TjCW|qrfP_rZGJ^2hLOhK)_fYL1S}PdtliN%O_A@bs6C-IvxN3002ovPDHLk FV1i#&k4gXl delta 369 zcmV-%0gnEO1IGi9JPN-601m$aI0aKAkwzzfMM*?KR5(wilFe$uP!NTuV8!QfA-I#a z8i-o8r4nqBYNVpwg%^vY(^Sf0xpMO8`?i4tf%w)qjEYiK-IN5?0}(Y*?d6` zckW)E3F9>Ja#2~Wf&f-$g2b6@^Ev^}-dJN%u&5zmf&?qP6+l<0OH=&=qQdj>n3&`B P00000NkvXXu0mjfREn-~ diff --git a/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_top.png b/src/main/resources/assets/naturesaura/textures/blocks/animal_generator_top.png index 4ccb8244424a4c0e20236b0d0e30c6e540de35e6..ba9154d69f1c2ddf53bb0f21c1a8bac8b5dce8e4 100644 GIT binary patch delta 437 zcmV;m0ZRV31BwKYJPN)501mzZ>O!%=kwzzfh)G02R5(wCQ^8KcKosN$JV>lkAe4}z zQUM_?U@2Gyf}jE70X(P)#(3~sy!ZqDkvG4=?-=_w&Sp^)50l;Zc4l^7H%$#nhY<7% zEsBkDrlxHEi`+7 zCPy2{#>CL|5ao)9@+F)ngjE>hvhL%=cF_Me5*|la-$0y*ZpOhf=wj+MaN8T;X|llF z4>746qmwD#hvRvNRKuY?qT3l@zQPK*0GI!D*fNQ2NWVA+bakT^@kt=-(l zEBqRPSR}K`x44T(SdXvpm|)fEAKY(7 z*DBK~dp+0yz2`O;KruG)j{$_>?ej4jVDJ#vYXpsZ;35|~iGl0*z&@>?gALGoat{!& zzTBWGYLXcEJwUJx?Jts?54H31tg_inFhJLZP1v#Ru;h!t9L^kFT@uDQ#NAG1K92@i ztr-#@vi0i*^*yM!P!tp;24+a`j0PRUcK~y+Tg^xiCK~WHe-|vt}NhzWz3;)K#PAQ3O$VN&p8zhp_%Tn1W z8$WH_Gn$%v-(c}|@0^)A=iZ2jzLKxUB!oR7C15yLTe&Mmg~pzWt%Ps_nbD+#Y-P#@ z+3NhW+}u*BePaV{E_lmAraa;WZNh&*a{+qRTht&)ULu6)z$-L(g?xvN+#Omt=M@%M zvK9qX6duJc`a zm}N;IIKPFRb02+cDh};|eO+*U+OkjH8R>;KLXF?Og<+#~seQkcu|+yJN|)OG_4r$Z zt}WT0i+n&Asu+rZ;S+=38;Fr!Xrnq_Ps8v_L=UU!dK4vQij)8V002ovPDHLkV1nA0 BXRrVO diff --git a/src/main/resources/assets/naturesaura/textures/blocks/infused_brick.png b/src/main/resources/assets/naturesaura/textures/blocks/infused_brick.png index c03c7fe696dbb74509ce25f53b0888a7ecea4e60..17088b3521304761a7ae22df22fa44bf36c794c3 100644 GIT binary patch delta 689 zcmV;i0#5zJ0{jJ#JPN)501mzZ>O!%=kwzbXG!sB*!~g&SdPzho95AZg|^o>A&Q2}Do zhi8oWJ2HEabuqZY-ywE8iuGs+tfC1u)*CKq*Na-Z7XB8g*$J?mil!tXcLrh81iZQy z1+8|&@cjccXP%433!KYgs5f5>`G0q1iG+&-nH!sl;~GP97X^(N!JQW{rjcxeA@N~g z4ryn*vyC~I3vtYQETARs29|7pAVp%eNGPeMQ5jO7J(EM!bwCyR5(wilCcWHFcd}e z!-88sM$o}Y2L+dcbae5nBByY|ZDUdNiSCU5t<-g^8NnuO^`Gqf3rp z(njF1hdIF(2-eP%VmxCxqY)AHvnPe7-@qBYpn;b)NW+p%&8QJ(0?acZeP|;<8srFT v7iBR*k_Ktquf=Ey1~mHwnrFT9KN#u{ip1@aI0Isn00000NkvXXu0mjfF7sFc{?h zU!~J&C&6}naEMa~gaC6G+p&{L^Bmii+Fz3KckCsviYBPzi0as*O|Q_|g5*s@o(7zJ z3E{U0UrGe868W)184V~82FXTa$RF_Jp+|K(L+*R@>53{GP>TiG(IDF!MB5tCZwbkN zrY4$E20dgjpx}SmzJr&uQH3LnxZqs8<7&Rq1PkhLa)UI#m)v|V9#E$VtNw#7yP`OB zNc;w#Nmg{?>Iw$+#2{~|f)Nvc8y4m)?0KK74=m*;YErg6N=#_P3{S@w^!c3ypQJJ% zCDcx=808Zk3w2Cd@rjM{Zqcsj^kta-9l_nA|Xb)}Kz; zjzx;pOhS=~rs7=}E7FZ|h#DgHn(#t#23j{`R$nkVt>eAmmWovB)5ryO5Yc2Sk?|YR zb=eJu^gNq^h9BaWnp17cIw(@v{>Z2{@6=+fKM+%ObvTnE5i)@T&!M={1&R_erjcJD z-5PQ=Oj?iNh0$f=dTP*di|9gXNp3dPVU^0qd0DO1VEli7zun=86yAD9hN=$CYa zQBHRaQeRV)CrtW)=H_hQG7oGdJ;6sKc&h*T_!nh{jPJxc+rTc-RwmAHf_zR90TW>0@&1?Vw002ovPDHLkV1nErQQQCk delta 235 zcmVxJg7oR5(wKlQ9m$Fc1X& z|3}au8ia&IL!FletoG&VB_d%nfn{sGLv0)7a002ovPDHLkV1i^(XPf{4 diff --git a/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper.png b/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper.png index c411041900970c3f2c1dd15cf84fe06b7f8f96d8..74958630e65ae8b216cd8bf1acdf222de1b92408 100644 GIT binary patch delta 515 zcmV+e0{s1s1lRO!%=kwzzf)=5M`R5(walgo;lK@f#~i$D?>W^_MoLPgObE)+puy~1~f76*5;ICOV))u~fe-GN*#XPHb!NT<`5 zOeQUnNLV}`7eb+s6^li4e%Qj{uw}DZOQljKg6VW>qtVEG-?v7iq5XV57uxN%><-+2 z)oL}ZB8Wz#*6;Uiu~^t}IF!@jaIjvlXRj}wz<#sY*lM-1@pvrXZnrD70VHvNaWnxrSXMA;fz{`$9Oy*g~PCFrBX?wV?P)S^fpjMlfn6Xz8@ox1DRw(B4h+{rg3C+XV3F)?#CGO zBNpjDYX#rNVVzlT@1AN8!rd6%1$h4bq`+I7@BOlu;t%^%{;6i(jj>Xx$N@*30Owm9 zfz4)9C0)npJ`;_j%Mh}M5b*1;1A`myhvvj2q_&JzUi@RxP-leS>(@CAPYPDz9?Dg!m-nB%e0_X>dLVpeOaXSgo#X@p0cac<`)@QFo)#3uovZ+? zn8K&i=?5U2%}P(N8YqA}Mk^Ewq8abUbBveE#RE_$zqUiW-ERId&gXNFi0-o85ZZ7! z^pA1B-+M$<$;wqs0eoYms}1jrH`F)A*=&aE^@`K!Br8uLbUYs8e!t^zI7s3odcBtQ jImUngOa%P>cQ)|@yd*HEJBY)y00000NkvXXu0mjfd%xLV diff --git a/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper_top.png b/src/main/resources/assets/naturesaura/textures/blocks/pickup_stopper_top.png index 2f91924f24d05049759d6963cd3b143d125e49b9..d3a7c75fc0ca13eb7f28b40c1797141262e97e0a 100644 GIT binary patch delta 465 zcmV;?0WSXW1f~R#JPN)501mzZ>O!%=kwzzfq)9|UR5(wilSzvLK@5fazbJ@^C@qT1 zUGbm?72Hr!!F@$>MQ3PgMbQuBogFEm&>J;5d#UWkrN06%wuIF0G#{%UcpG` zj&~=e>R;z@?Vu8tI zg3)M%!C;WkXf$v-olxqS(`vP_*=#VI%@BY}rGjWQigY>+kH>>hD1=6%A>s4+B%jTH zX658Jx7&?iF!%$Y)9LX3{*F$kgFqmFOeTZ*US3d`kE8miSQB9RDUu^5WQA~u_ioE$DIkSbA`n?}^V8{6 zfD46!h$;XSg5q#L0<>B!0c26P+eN)z$9z5)W~`Y^CbAlP)M_I5Lri;eW1g|vx< zN+T!pWR5HBb~^!hvGMPq25d~FQX(K3DMJ`9HgfX$d=?jYa*6`