From 3b72df0f456c23f25ef84c3d774079b2cedb9cec Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 30 Jan 2019 17:51:39 +0100 Subject: [PATCH] finish the texture revamp --- .../naturesaura/blocks/BlockAncientLeaves.java | 6 +++--- .../blocks/tiles/TileEntityAncientLeaves.java | 2 +- .../textures/blocks/ancient_leaves.png | Bin 407 -> 655 bytes .../naturesaura/textures/blocks/ancient_log.png | Bin 606 -> 555 bytes .../textures/blocks/ancient_log_top.png | Bin 540 -> 536 bytes .../textures/blocks/ancient_sapling.png | Bin 376 -> 388 bytes .../textures/items/ancient_stick.png | Bin 274 -> 286 bytes .../naturesaura/textures/items/aura_cache.png | Bin 756 -> 372 bytes .../naturesaura/textures/items/gold_fiber.png | Bin 399 -> 561 bytes 9 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java index 784e6a91..63780a53 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientLeaves.java @@ -117,13 +117,13 @@ public class BlockAncientLeaves extends BlockLeaves implements @Override @SideOnly(Side.CLIENT) public IBlockColor getBlockColor() { - return (state, worldIn, pos, tintIndex) -> 0xE480D9; + return (state, worldIn, pos, tintIndex) -> 0xE55B97; } @Override @SideOnly(Side.CLIENT) public IItemColor getItemColor() { - return (stack, tintIndex) -> 0xE480D9; + return (stack, tintIndex) -> 0xE55B97; } @Override @@ -136,7 +136,7 @@ public class BlockAncientLeaves extends BlockLeaves implements if (((TileEntityAncientLeaves) tile).getAuraContainer(null).getStoredAura() > 0) { NaturesAuraAPI.instance().spawnMagicParticle( pos.getX() + rand.nextDouble(), pos.getY(), pos.getZ() + rand.nextDouble(), - 0F, 0F, 0F, 0xc46df9, + 0F, 0F, 0F, 0xCC4780, rand.nextFloat() * 2F + 0.5F, rand.nextInt(50) + 75, rand.nextFloat() * 0.02F + 0.002F, true, true); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAncientLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAncientLeaves.java index cc73d591..3caf3a32 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAncientLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityAncientLeaves.java @@ -11,7 +11,7 @@ public class TileEntityAncientLeaves extends TileEntityImpl { private final NaturalAuraContainer container = new NaturalAuraContainer(NaturesAuraAPI.TYPE_OVERWORLD, 2000, 500) { @Override public int getAuraColor() { - return 0xc46df9; + return 0xCE5489; } @Override diff --git a/src/main/resources/assets/naturesaura/textures/blocks/ancient_leaves.png b/src/main/resources/assets/naturesaura/textures/blocks/ancient_leaves.png index 266b9e775e6994c49de086c817aa53295163b380..5473b5d6883bf27389abf9b73c2727dc5354029e 100644 GIT binary patch delta 579 zcmV-J0=)f~1CIreJPN@801m+cxRGn^kwzbXG!sB*!~g&S4M{{nR5(vflh=v@Q4EI9 z%PV5-B1g-EL=Yx0@laTrP{x=M!=_n~gEaWKv%eiG)NV5dpB%=}4_slXyHX4u?Z}y`Btz z1_R0G^P2ldcsLx4357zk-ENKF?-%0rdYM+MCDCY9nNZN}c7>qG<#Ng6@i3>;$?#NZ z)9F;1L4<(|yWK8Mr&H~b45-a!QzejmJ|E-tdPR$gX0s`%ft3On0Yd>#iXa2L(P&7u zS{1k3Eqcj;$K%oBTW2#9(Cpja%bH+&%#8}x+@%}nE|=Oom}j$@ z)a!NKJUp{Z$d1Kg!X0V=XZ1}clacXwtjh!#iTKUsavDfQ0ZQlv>{uf2`~4aN3bJV$ zg|OkBErW$=aE@Fig4*?ZtxX0lP$h!KE>J)d=>dt1?r$=@lgGzI9z>R9$q)T_@3B4L Rmz4kj002ovPDHLkV1hO75yk)j delta 329 zcmV-P0k-~+1(ySmJPN`901mD(J3q=sY3+T?ZNAXlsU)ndMr60m%lK+3=w9Pn<Q_kDTLkQ2>=uIr+HU02-i z`;K1QwoyYH1_&V%*#JQPq+tM81M;s8vXJRc25y3g_-jB>lWp7LzAQ_vxq-vNz@`O% z@8rZZP1V2w81NbND`?~mXdcHA4`q!r8|3$iPa()9&hs2ovcZ=K_&wx#;<~OOCdlbi zms>Z`03j3ieUCd$jhw0&yRW19%vq31kB&5^P5d!%!cXI=Px^;7VD{ z@1DtU=)rS~FtErOg$Ed9u>v`o1X)Nl;`DKUa}78nH<92pMfT+7KU*LdI0@GV*?_zJ bcl|6c4M!tjCd`6C00000NkvXXu0mjft)q~G diff --git a/src/main/resources/assets/naturesaura/textures/blocks/ancient_log.png b/src/main/resources/assets/naturesaura/textures/blocks/ancient_log.png index 3406b9603bf716d83a3dc0cc4deb1a5ad90b7ee8..3896da89088e77dd9ee9425186e646e9c1feb032 100644 GIT binary patch delta 478 zcmV<40U`e01giv)JPN@801m+cxRGn^kwzbXG!sB*!~g&RsYygZR5(vflJ8E!Pz=TQ z-G~wx42A|68xx5pC?J>!iu%nL5J8CV{|t4%UV5_+OS|6F)6+k}xLuXEVN2de9XTvA znOxV@-%S(s*J&iLS*!RW`MT@s8(EiG?q(_7$=7_rT4|c17 U$>U&FoB#j-07*qoM6N<$f?y@uF#rGn delta 529 zcmV+s0`C2*1l|OYJPN`901mBZQ%=9!yPOqub(vhdm8_gisICXW^X-~?0wNTdZ$ zdgc)}?iAgwO=%IPJ?^%ZQHWXy49Nt4=n0Uwqm)!#pMt>B+?)5<_R@Yy`FivY5b6vJ zuoB>IM@fvhI0gQtTt&OC7f7m$L zP5^#tIrYXGO*;S?H#DG$$iyIPDuu8C%&OZWVoV7&ES8}c`nJ2!Jyu-ijV(nT3IM<( ze4|bMFYpKhs3@=iwAb8U_+R6eTGa3k7AJeEf3iYMD(Rszvxp=_6zQ!Ge!IWHx$J5WhncxMduHa$y5t}(uvyw zA~_ALpf81*_zrdqt;!Y{5nl-WY)UQ)392^!e^_5*C8r|VsvK$u2uT9I*cF7p=CB=N zKf9OQf+%h)&&KwgAC%A(Rj6yGM_=QbT<123K1;uwx5>+(b(@5C^Poj<(ZubEzFz{N@1JDt<^^xojTxgu{- zQL2SGwcs^e(%8TmdHA0PC5=Dgl8oY22?&N!SKh;p+G!;9liatjy>l72FVugo6(oRv zb=2(2-DX4Xw<5W(wB&ldrna{c%Ag*rpGALrPezV_;=Y4N4qIn3*}t5@I6bHOB)(J< z{-Jnqyf!bxMn^j!$=bvkAjTSz5oian5cD=9Pe1}4J?*r8+x8RWj5b3+0^*n+_+O6j z``{{9l`hQJ5mdyK;ODgG$*dayQNP-MlB9N&Bbywr{fU@FC%F-9Rhr08ZbRlXE}i%- zAd=U>33^-JRo}yn;j6kWFe1JZyzDOOMIph|#{Un~YfKu;sfeyBht>f?l7O!^g%Y?N zwnIFqFXXqNin|JQf^gX}Y#V4pF2egQKyXtI^~3b;(c_`gRG+)S)z%K&*h-)}H_;Jf zK?kgihh%53+lRRv@VABilCtqci4lj`o_ZFX8{VR#`~qJU^}&rHffH``c+}+Wmh}O6i4^1n>2= zyjJJ(*qy#<-UB?4;9eh1L@daJ8hz2!4Wd9M^>}D!G$oFvKAjV?nO9b9W|cMGmIoJq z157!k@eOdMc{3eZLDOYQof<4Ht8R5(wikTD7ZK@3Ir zAc7z$YGGj`g4$@ajbJG@f|mAnUc=fmcmZ!V?i=|-b~d|>#Uq)YT?K?5|OSK~_hY2?;a{ZKOi8raB?qKrGA05sXnr{yT-(q)b&QbK_SU6&yYi1s5v zGmsLYZ5U!ej^qw3&mfJ2G=ngl0n$i}pV2W^LEkV!;AR5(wikHHOqAPhxW zfDODGj~+Z4;s6+@@Zcowz_6HaQUkPDjE9%dZyz6xwe}ZcsNuc8!I^#3fVd8G9J@YZ z7ME&}d@lR<3nUq^MG2CRY0G4gElSjyiEJo&YbIDgXw8HewlouB*wRd}AZ-pI80Q== x+eyiWv>EcJ3(99h)MW4+Ah!H-i5RwH%>@l*Z`?WI0fztp002ovPDHLkV1j5$Pt5=T diff --git a/src/main/resources/assets/naturesaura/textures/items/aura_cache.png b/src/main/resources/assets/naturesaura/textures/items/aura_cache.png index 19ee92f8b444b09f19a333924e4b27951c2a7671..1c66f570bef2a4d78fb478178164d5fcde3c512c 100644 GIT binary patch delta 294 zcmV+>0onfa1@r=tJPN-601m$aI0aKAkwzbXG!sB*!~g&Q@<~KNR5(wik+BNGFc^gU zqE3R~bBKd>?c(4nND&w3E}|d^E+Pf3xb!)qU+_YbMiCr7Z0^6iKem}M<}Z>W>>d{* zs`~Vj(!P$M(0X5u;Lu(zl%U7{;D8Bp*^CYNB|66??m=5IZkobA6I6+GG{3|Zuw6!f zh34(hfM1j>K=8MM!mzBTA4^=pd${Fyah}-VtQk0px*yz7U&dWun;H7y@|N2$Fz2R} zBn#A@AA4@AK+}Rw0q{2%$V7nP>Ym#$n&`Ylpi$S8k)XopUq2%-@UN*aBjPXw1%N^C sgaVaFkNv^H2QwiN&qY%F9g{r)BI^SY1l($u761SM07*qoM6N<$f^;W`!~g&Q delta 681 zcmV;a0#^O>0`vutJPN=701m(bYSxJfkwzbXF=Hy6O8@`@a!Eu%R5(vvQ`v6QP!RP) zn}SNn(x8$e>Jaz@kf0*OPSTbqmLeWf;3E)-f!uMm7`;rwK4Q^AIJ4M zqS+X>Ki$UGhXg`9QM4L!3eZJE8=+e0LL~JnU^B`Cm~_}`%!E(Ac#V~7D_FfAK;qyP zn);Zk=;50&A)69}H6sngf&{7-+Nf85hE(ErB%U84W1Qe|_b=HWsHHySr+JjWwkgnr zDjkUcY<>k%;u}myk$m|Ex#lTy<|(qxU)XD(Ayb>;;g=5NCwW{=M}#Jfakv7wAr~y8Ouo6M&K?E}K&(&v8wTbH~bB5Zg zkPeB1L#*Em3L1=YXch#R)of@(w9ON0RUfxVbuL*g_60ay=!reEHl#V3p-~;W0cakC z5d6bKWK{ZS8e^d{cVcyOm3Uu&hWsoKje;0NrC#l$MXh8E8}VQ+kVKD(vsUb)WBx!e z6~>MCGUU&91T`MA8cm`}9ns4@Hvr*$3hYg7Of=?nkw#gKVg2qEL{l+@sJ%Ra9K1n+ zSbe_FQ!Ex7z1jqjrTSlh=e P00000NkvXXu0mjfc@{e~ diff --git a/src/main/resources/assets/naturesaura/textures/items/gold_fiber.png b/src/main/resources/assets/naturesaura/textures/items/gold_fiber.png index d46e09d708effca4ac005874cdbefa26c81d55c5..cdb38b5f45fdbe14663f5dac45ee55fccabeb1a9 100644 GIT binary patch delta 484 zcmV_lLKod7a_ zeE^?KIrb`7%acB@k@a7o!1)9JJVHk*y*ayg?C0=aKCo0iY# zm7vvX89wLp`9pxyY&KIc%$-gr=!?ZddZW<@6+xKEWTcCrUawm`9#f?`~ALEt5xaD0)G)OM6zJGTrN?6p-_<1d_Gr8^od@nRAgrp?RMK@vDn`V$i(S7 zy|Y#@nTNxnsspc9D-j=$M`3-k*{s!SwGfa_q