From 80a54a8727da33a24be3cc9d7725a24a58092c63 Mon Sep 17 00:00:00 2001 From: careeoki <122191047+careeoki@users.noreply.github.com> Date: Thu, 11 Apr 2024 05:43:20 -0600 Subject: [PATCH] Colour Balancing & Texture Changes (#314) * Colour balancing / texture changes Slight changes to block colours to look nicer. - Oak leaves are darker than grass. Oak woods are less saturated - Sand is darker and more yellow - Stone and soil are both slightly lighter Texture changes: - Sand tiles better - Gravel tiles better * Cont. colour balancing and texture changes Essentially a more polished version of last commit. Soil is more textured, with a new highlight colour New log is higher contrast New planks texture that is less contrasty * New grass plant texture * Edit sand.json to reflect texture changes * Delete misplaced texture * New grass plant texture * Fix line endings --------- Co-authored-by: IntegratedQuantum --- assets/cubyz/blocks/sand.json | 4 +--- assets/cubyz/blocks/textures/cobblestone.png | Bin 401 -> 497 bytes assets/cubyz/blocks/textures/grass_top.png | Bin 404 -> 392 bytes .../cubyz/blocks/textures/grass_vegetation.png | Bin 5503 -> 276 bytes assets/cubyz/blocks/textures/gravel.png | Bin 509 -> 585 bytes .../blocks/textures/oak_leaves_transparent.png | Bin 565 -> 540 bytes .../blocks/textures/oak_log_rings_top.png | Bin 431 -> 465 bytes assets/cubyz/blocks/textures/oak_log_side.png | Bin 339 -> 425 bytes assets/cubyz/blocks/textures/oak_planks.png | Bin 366 -> 400 bytes assets/cubyz/blocks/textures/sand.png | Bin 325 -> 329 bytes assets/cubyz/blocks/textures/sandstone.png | Bin 312 -> 314 bytes assets/cubyz/blocks/textures/soil.png | Bin 307 -> 422 bytes assets/cubyz/blocks/textures/stone.png | Bin 338 -> 327 bytes 13 files changed, 1 insertion(+), 3 deletions(-) diff --git a/assets/cubyz/blocks/sand.json b/assets/cubyz/blocks/sand.json index fb543217..992ee5b9 100644 --- a/assets/cubyz/blocks/sand.json +++ b/assets/cubyz/blocks/sand.json @@ -5,7 +5,5 @@ "auto" ], "model" : "cube", - "texture_top" : "cubyz:sand", - "texture" : "cubyz:sand_side", - "texture_bottom" : "cubyz:sand" + "texture" : "cubyz:sand", } diff --git a/assets/cubyz/blocks/textures/cobblestone.png b/assets/cubyz/blocks/textures/cobblestone.png index f6eeeb0343687b7a22196c038d74ea53bb0f1061..d4393d0731ff643b019d38a8593a6879ffa802b2 100644 GIT binary patch delta 471 zcmV;|0Vw{F1MvfpB!9R`L_t(IjfIjiZxcZfg+C`JT)jZErNmz+XWJ$MnaUp zUrK?5_-hD>B1sV$rI<6q7gw_fLKmF`#d%h18m8I3)4rKE@4eBdk01U3+->erRs4L0 zh88y|(9j|xtXE5>RZ05JIft7RWV>b`0V09`&N-ys4h_AJ;D24S9~!ITCItYQh89(Y z0}wz&;e7Ktme``1y zXyE6w*g2gT?|;rAB2j&FW!LP%L~TiC;a^N8-VJ(j9O@D*=)X%=Q$bz)p<$RJ)){)=5Z;luy{ delta 374 zcmV-+0g3+c1CaxeB!5^*L_t(IjdfG8YQr!TygKe|zo99L2UF3Zlzu=UWNQ0g{m2k9 z2|O6l=}9z$Gqr=GrzeLBjF!85=XZ2fe;X}ZAsZxFS3womig?pI)r*lZs0b3W$~mu*Zgbcsgqv0Qtl?Ie)S zB;9kxOEPnqGgwa0&0OBPjj9J(nW!o3=OE+FBXe#jigb3mC^kMVxGCfsj|Jah|sw6@88n zNq<Il2Vq*lfo= zcr}YCOW9l|M`lcb$RxpDe7~tvF4OAqb_)qsruAuJIETHFBxk}RZXs8k@yoj)u&B?` z6F3dZ6G?{!;$)VxJtefu#E)<7f5C>%oXM?;?a~nGu>Zd-L=t`gZ5uI-nnYAU00000 LNkvXXu0mjf2G*O9 delta 377 zcmV-<0fzpF1C#@hB!62;L_t(Ijb)R)j)O1|gg+C|A=yx*N`sU>&Aq}s&^>N?B$`wd zU`rsdxB{;+9F48@{>;n{>gV@+Gr9o4x&@;Pw)+j$d$#)x*G(}dck}$>^S0=wB$Gz~ z-IM^hZi=TA0I`v6XJlwD)2v${Aka;TsdH$F1xSPzF%zS diff --git a/assets/cubyz/blocks/textures/grass_vegetation.png b/assets/cubyz/blocks/textures/grass_vegetation.png index 49d1fbce0cfddb595b5e6ff688532b449cd3cbb7..094c57fbd7461466f45e3dfa46eb755d52605c0f 100644 GIT binary patch delta 249 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 Psszn9*ylIz=(PU=osN2y diff --git a/assets/cubyz/blocks/textures/gravel.png b/assets/cubyz/blocks/textures/gravel.png index 4e02f9887ad50e2689f47b0848974f44e862dd4c..b8efdad3d820517317e22bd181a5965d35e367df 100644 GIT binary patch delta 561 zcmV-10?z&Y1IYxCBYy%ANkl0N&FWjN+SC`8s|7aI|T^MiIOO#$ba%RjdN%{;QZ_~EGunA z1W;{jVj;M>y`$RJVIaWG?HvHI5R|sUT1%oN#uNZ_7K_EJpKeTn)`PI!n1cCiic$)I zEMJH1{_@D{0+`RHVX`p=u@F?-8fz_CzDD+Yp?RE+sJ1nchcZq_tnv+74*<}5z$6_~ z+KN@a0pR}OF@NyM@-@a3L>@|(um98L*(6HRI2SHzL)Lmg9#@waG|rJI8RYG^ABs|nWLt+wd(Vw2sJ3+oT4^g9 z=iVMuJ1QVP>#-0RQy}|2+Kl|LL`mkeDFFWfzByDZX{PqU@8MZk$-3I!MbTNl_5yt2vZr9 z3OO84=v2Grx@p<&_M@{*x3;5hTJG-ezr75@jU)eC>1*T%f;MHQ!3kdO;8u@Q)pbh_GguEQ>&u@ zfbvi&{ta1Q?-mxIuW!s(69B5?E1o0)jAuUMna}Duvw-``2!9jJd^MpuzS1>@OL0|R zU*8B5O}3dL|MS&^e4AQ1Dc`2HuWtZ!jX^s3^!bDJ%0s0jXxf37@{O)Bh#UYN1(&O}Q!Ja1!2kdN07*qoM6N<$ Ef~W!cr~m)} delta 540 zcmV+%0^|Lh1hoW^B!B!#L_t(Ija`$mj@m#FhQD=?T*PuDYRh&C%MA};rGSnikvl|Z z@ebF~q)0=@JD}?j9ZCv1&?)i*xH-8v+j7n6kc*?aO#!olYy+O1nce^UXVq*y)T`-1 zC8@9N$OT}(EELxz`?K{>1628u(ZmN}wncA2P`4d&ljO%&ZS9wZlHj>KvEMY*ZHLGK zup^gqd7^GRR?~yZw~Yd@)Rg%Xer(=3uPI)*W|kG zIF~0z4+DKJPy7!L;Q6sK@m}3_cS(1iU%{FiUYpA4N$P7$z@5tztLZ@j)K725P9ZLP zcH|OgA+z;R+mTC8isLLK&O%*3z489?O5J`j(xmuYo`3FO1{3EpiDC`F`^zi&wo$9; zK?x7B`PLng+{?F(8qWu2&P8jO^iASyJ=Efsyc6N20Dk`ct|f5$EquoF!3Er=F}!41 zN$P9aNK)Te8F&tSe8P_0%gLLD{jyMD(lMuB*3;r5Z+`U5F9N5k|BGCu9-V^ z?4R^s=+MEdqH2)`11dq;G9V8&l0iCJcALJ1lz8{}?%nb3$LrI(ns^Lh4=4WjPxkh3 z!jsMSFZaaD1)rg{HGzs~ZB15Gtkzr9#KRjVx3CosT#ywNfr?zLJ)9W*%ke-(7}F3h z7mn;RjKrYfdVfnMYSLtWb*3g>XJQvrIn!EOqxF?ofo~a_HeqGs6*em zD{H)55cjvWwswSRGIwe{HSyes*&SWtFhQV0-<4rZ!@fOV=0MEqhN)9$4{(t;dWp)5a+y|Q@5-}JV z9`A3MFP0^NZ`K1-k3zfGX8@6?Bv4%6?31XZDk8w=*N!w91C%4EE|DmOcJ>GQl;k-1=QB?>~+!`Pf6bBIK2 zR_nTJnv8=xp?@QEx9(7;8#hMHK_p^&eN`KjMB;uOV)y*Y>Zh_cue$FV?6^;wjO#tO zKQ<$XMAe*Sk?F`FXIB}oaGH$a{kt5YPCU-}{MrRw!*xhuhMkgNzF6{DQD_F|5{Uwe z`C^INA89>3q$e}%00h6QFSkDeV1}J~t@;C>9qfHX@(zH|00000NkvXXu0mjfYoEUr diff --git a/assets/cubyz/blocks/textures/oak_log_side.png b/assets/cubyz/blocks/textures/oak_log_side.png index 6193e6cebbfb814a1a335c085e647ef3b9814c60..ccc4290ec68654295e666979f1dbbf68fbaaf578 100644 GIT binary patch delta 399 zcmV;A0dW4)0;vO#B!6&8L_t(Ijcrp=YQr!LeX|o%?k|qF5p2w zN}vHJ!3~MoK0G;gH~qwsCB3I->E+}7?c3aDSm&Wn6->XxuM!-(lQ6d#ZC&8=Yr^?> z$j*!|mEZsXC3q|X0CrxWJBeZ1003=WWM|ga1x&wyOm`BaTYp2c^D!6z&c_3ktYDo- zBT5X@28P5axDjRQjxAW{cc5Q}OvwsL@OWwGK!2DvD8bRzMJztL73Ma_b^!zi6m-2m zA`2=wOxquH(!n|(L?rRZh}HG}*nNWId^}`@0DxKNp=1?BA~s}{KrBYL#&{+8E~4%v zs2I(~>!r?E5r0V9Hq)n&03eE#vQUC&PubQ*jJM7Q2G;q^nI@(Jk}v&d>D1Bt|ED|w zkgycPNPXIcv_C?mIZ6GxlQ8|Vi%8?E1c#DUMm61)MwCJDdBNz`unQ!T>BHirR0;KY tFHFCn5oH)<>wJ73>h+mT$|N1W9~sa0^nsWF)&Kwi00>D%PDHLkV1m_ky`2C6 delta 312 zcmV-80muHS1JeSKB!3!7L_t(Ijct;#YQ!)QMCT+dI2O!SYTTM@^GErVd}z4#8du^# z1bmpJI7S)ER%L5vwQpzl^7Z-gyOb5BZn#ZX@Y^i{0J0}6Wd(p!O<2l`>UJ=%uhPf0NYDh1hKY(j+Hlwp z00_6~+C)U2Cu<@#Obu=xXh5f-iEKj)wHEqK1KyLEC))L_t(Ijg6DdYQjJig+I%ngbXAFK@?mSN;h4#4^Zgi_-wvT z7lNP&sVRaPonbH=yO2A*{z3016Xs;*p6{M?X4AH_r-cgX?v6kuz7ob=2i|g7oCkuMn>Az zc@TeMK{JwEh;H79NC0VnF0_mW1zMv!0We?lpEP$D+T^$K2TI#xv0hz`PiLYtn@*1U zWbIe;&`e|!!AFd4NwWw(p5;JVmXS)g=HAQ&qW<`n&MfPF%C*$V``` delta 339 zcmV-Z0j&Oz1MUKlB!4wYL_t(IjeS$GZi6rsyjC6}8EhEJ(4}gIEZx!%=+H0ffAvQ? zc8V0KA*d2UL=Yf=vb95U#u(aL;7+_}-@V7p*ZbQKu4t0C3g15q}4O&|jEh01(^V!H}%z zaXg)!vr1D)*fnCkewy{{=HX`4Rynr20|ZG^cesCegw1Kowm_|^I~-5vAw;F+BtU}2 zZZiN7ScbJtzW{VT%t$5R>N)Y_nXL4?~m&vrxlwsYb$ lP2x)ibN;B0|BdM$`~uhZ^vfMl%3J^d002ovPDHLkV1hi{^MsdS#8v-w{7Bf^%aYOOvzv{&eX@6N!+z?e00HkGYT)iWPRMPwd%+Dv%ZsD!DGsZ{OAJ&0BBm)2^BX)oj?y( zABH@`ZuK5B!3J^L_t(Ijg68$Zi7G+goo8)S#q~7DBQ+{+nmAY^$ECun{*Kc zX^}<2c2N+>kZN9rHMa7q{rld`?oM{UUFRV-*n|Vz{)DNkpvArKuMgy*co@4OHUO}I zxu!6H1x&_qW9ljc$JiRowLBCCkFhnzvFn=EAvPFeYfTC7-hbZV_9qOnfmcO;~4-jb(J~wDUhmCZ4KUp1AJ;9fZ1fFKcrXkscnTd6Ks;^ zCHwij%xscwzG`IQqy7KDoNGorA50IYDq0GUvHeRT6`#S(i^6#*;POx`toL(^b07*qoM6N<$g8o>N0ssI2 diff --git a/assets/cubyz/blocks/textures/sandstone.png b/assets/cubyz/blocks/textures/sandstone.png index ebbf91a479db85b32ccbbe2832e7c8621d5c3c21..f6669b6669d5f87bcd36074e0905d1d4293880f1 100644 GIT binary patch delta 288 zcmV+*0pI?(0=fc_BYyz_NklqG`F(8?mzCA?f0aFUJ?>w zuup*=hN{Z8J_JR!=Z$22-T!{!R@;`-xdSi{qb6l+`L-?6wgo_4tKF$<)uft~=e!mG zscW6e?jd~)!>#l&@K=*kj)7>>oIsoz&}U3l(ijMD)5biE0DlPV_mH^oFTev8qh&6MUG|QUuHWNYuC>Hi_SP+zHh$}lZl0@J zW6C<@Yv>sOa_7>OO*X>-ls=a0)0ETJ8Z5;FkxrS-{ k)Sx)d+`oxX3m2^Z4K0V#iHp=0!2kdN07*qoM6N<$g3f}BR{#J2 diff --git a/assets/cubyz/blocks/textures/soil.png b/assets/cubyz/blocks/textures/soil.png index 67f900ca7851119517d46c25fc8308b7db0f2d89..d671129e99bb0a515acb6217f9671bd32c15dcab 100644 GIT binary patch delta 397 zcmV;80doGc0;U6yBYy#HNklypJ$^KVvv9I@Uca z&{=~NgbH-lFu4vt8f_3$!C8Zmk1b?w{+$UxOhqrRd)BkZ-G4HoJf9}NRQ>w)Nos#Uy@%j=$5=3cQzsIGff+J3A)9Pwfc`M=-`6V9Ul zha+Ab@nvG`LrkTijZzmzTgaHnb;MLu>k%*3J>y4%vqobRW+Ks#hR5Av1Ss8>xhJNg z(TY})AkC!cAb+}AlWxB1mx$|Sm|Vv)+oot?kj||a@>I7wWgv3exQEYd1uRhs`1zZZ zMLWtGV{1@M90fob<+nR}eA rj0dS6&cZVHZ#t`fqmi~TirIh4$Voe^KuR1c0@#Z6K~SYxAmcF7i5zFqAOVHr77EkU4Q44t*jF zMr0lk@H~9&3Dl+8c{oZKOfL|mwsDh0R-~_Bu3d|;p%==6U4MDGwgK1fUFZ@t!f+mr zp7Unj@<6*On0i2Ve1?BLr99Y|mfEmBoB(jI1|xRM$^)z=z+~9B2Xx fvX3^IsJt%#Z4&RP-CTvQ00000NkvXXu0mjfsr`m+ diff --git a/assets/cubyz/blocks/textures/stone.png b/assets/cubyz/blocks/textures/stone.png index 05f9c6c8047ea9149490104859b0e07190b849f6..0ff416febf460655393002c703ecefb6ed7d92c2 100644 GIT binary patch delta 300 zcmV+{0n`4{0>=W7B!3P`L_t(Ijcrr8ZpAPRV*wAcJmnofTA=;uTvHTn?GR9v-FWdK zS)@q&sfJmtS{az%%jd{UdR$Q&UtTpCis{6W*vonpnDd1Bud-dLTf?en3EJYxMYABh3*abV z=iE-2747Ox)Gz|<_3-`OsN8G9H^NmX(Z|$Ke+