From 284a38eadd87777c40adc54a23c17153db948f1e Mon Sep 17 00:00:00 2001 From: careeoki <122191047+careeoki@users.noreply.github.com> Date: Tue, 18 Jun 2024 02:06:53 -0600 Subject: [PATCH] Make leaf filenames consistent, update opaque textures (#483) * Make leaf filenames consistent, add opaque textures * Delete textures/oak_leaves_transparent.png * Update oak_leaves.json for texture changes * Update non degradable leaves * Rename oak log top * Nondegradable oak leaves are alwaysviewthrough * Delete assets/cubyz/blocks/textures/oak_log_rings_top.png * Rename to "oak_log", consistent with pine log * Delete assets/cubyz/blocks/textures/oak_log_side.png * Update oak_log.json for name changes * Update oak_top.json * Remove the non_degradable pine needles --------- Co-authored-by: IntegratedQuantum --- .../cubyz/blocks/non_degradable_oak_leaves.json | 4 ++-- assets/cubyz/blocks/oak_leaves.json | 2 +- assets/cubyz/blocks/oak_log.json | 6 +++--- assets/cubyz/blocks/oak_top.json | 6 +++--- assets/cubyz/blocks/textures/oak_leaves.png | Bin 659 -> 531 bytes .../cubyz/blocks/textures/oak_leaves_opaque.png | Bin 0 -> 561 bytes .../blocks/textures/oak_leaves_transparent.png | Bin 531 -> 0 bytes .../textures/{oak_log_side.png => oak_log.png} | Bin .../cubyz/blocks/textures/oak_log_rings_top.png | Bin 459 -> 0 bytes assets/cubyz/blocks/textures/oak_log_top.png | Bin 948 -> 459 bytes assets/cubyz/blocks/textures/pine_needles.png | Bin 459 -> 464 bytes .../blocks/textures/pine_needles_opaque.png | Bin 0 -> 457 bytes 12 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 assets/cubyz/blocks/textures/oak_leaves_opaque.png delete mode 100644 assets/cubyz/blocks/textures/oak_leaves_transparent.png rename assets/cubyz/blocks/textures/{oak_log_side.png => oak_log.png} (100%) delete mode 100644 assets/cubyz/blocks/textures/oak_log_rings_top.png create mode 100644 assets/cubyz/blocks/textures/pine_needles_opaque.png diff --git a/assets/cubyz/blocks/non_degradable_oak_leaves.json b/assets/cubyz/blocks/non_degradable_oak_leaves.json index 70f86ac0..e75eec95 100644 --- a/assets/cubyz/blocks/non_degradable_oak_leaves.json +++ b/assets/cubyz/blocks/non_degradable_oak_leaves.json @@ -6,8 +6,8 @@ "0.1 cubyz:apple" ], "degradable" : false, - "viewThrough" : true, + "alwaysViewThrough" : true, "absorbedLight" : 0x121012, "model" : "cube", - "texture" : "cubyz:oak_leaves_transparent" + "texture" : "cubyz:oak_leaves" } diff --git a/assets/cubyz/blocks/oak_leaves.json b/assets/cubyz/blocks/oak_leaves.json index 6c1c0343..169bcd25 100644 --- a/assets/cubyz/blocks/oak_leaves.json +++ b/assets/cubyz/blocks/oak_leaves.json @@ -9,5 +9,5 @@ "alwaysViewThrough" : true, "absorbedLight" : 0x121012, "model" : "cube", - "texture" : "cubyz:oak_leaves_transparent" + "texture" : "cubyz:oak_leaves" } diff --git a/assets/cubyz/blocks/oak_log.json b/assets/cubyz/blocks/oak_log.json index 79d16d15..989cc547 100644 --- a/assets/cubyz/blocks/oak_log.json +++ b/assets/cubyz/blocks/oak_log.json @@ -6,7 +6,7 @@ ], "rotation" : "log", "model" : "cube", - "texture" : "cubyz:oak_log_side", - "texture_top" : "cubyz:oak_log_rings_top", - "texture_bottom" : "cubyz:oak_log_rings_top" + "texture" : "cubyz:oak_log", + "texture_top" : "cubyz:oak_log_top", + "texture_bottom" : "cubyz:oak_log_top" } diff --git a/assets/cubyz/blocks/oak_top.json b/assets/cubyz/blocks/oak_top.json index b97ca1ad..f726868f 100644 --- a/assets/cubyz/blocks/oak_top.json +++ b/assets/cubyz/blocks/oak_top.json @@ -6,7 +6,7 @@ ], "rotation" : "log", "model" : "cube", - "texture" : "cubyz:oak_log_side", - "texture_top" : "cubyz:oak_log_side", - "texture_bottom" : "cubyz:oak_log_rings_top", + "texture" : "cubyz:oak_log", + "texture_top" : "cubyz:oak_log", + "texture_bottom" : "cubyz:oak_log_top", } diff --git a/assets/cubyz/blocks/textures/oak_leaves.png b/assets/cubyz/blocks/textures/oak_leaves.png index a3b5d6bc205cd517205e0616769dc9a868ff5987..39d4d39fc90378c78e816c02511da4dcbd8e73f4 100644 GIT binary patch delta 506 zcmVPi;5uGV(-aj;HC-Yoc!nf--#^Aq%QM{i8R(; z-~s?{7sc>zQ9Q|{27s|yaX9V(0QYMLhmurLv+aI^?S6yPS$}8%W+xFp;y4_4xL-RA z?F3cS%o&>%e#G(m_WY0}(pXcav007S&`tmV>e{(o6r)3t#`@#^6GJ`iXD7?d)7lcL8P(%UjdqgNMr5L^Q8cZ(Iqc%L6iDn w^%HaGnU2j0FK{8!SW_h$BYo5IBMuVz0*Q=LQZg*vuK)l507*qoM6N<$f+Rcivj6}9 delta 635 zcmV->0)+jO1d|1jBYy%~Nkl%|DahwH`KI}Zm2l@5CGSU(oS@J z9qGpQ(_k{1aDF<*^`g`cfKt{-MiX2w!tM?T{CE+stS>Cs-NBN`u;(Czhdn118ulC- z?JBQNo{@|u0Doj&o$PlCbsf7q;Ng=zFW#1sOIfZj0e z^s6kGy7P63K(Ng_ccyIw>xny}L_NJf+Y;0Y@tp0QqTcfOu| z2Vh0ZV0Q;gZ6~7%aw!YIOp=&}2>?F^zt9bp%vwC}$bVbP0^a9^(0sPa zbnPimU5DcVmu5g)J+ps0@^W$H^+ge70e`w@9&Rg?r%>huJUsm+D~9;m!xuK0abF$S zlq~>e?6JM;$cmx!WjarZQ_cO&mM{tM1-M*TvSP@jh^Vb*xv)Lrj3N8#K%8m-Ml(&j zKBD9R=*@g?qWIFRT7G>0<$TzbyHg5rs(U8ws{>haQWP=)MY&;n*ST}Qwq392ylwG9 zz(OkOQEpJ%yUv-nTv#`PMBA)d=Mg}d1dL{y={zM&0=&_OtLxp*-%LKmT)i_4%q9Ek zfHH7t2E3qnxUB$Cp2F82gExve)kIl(~ED^4}cPIdnPt27mifiA*t00000NkvXXu0mjfeMXP)P zi;5uGV(-aj;HC-Yoc!nf--#^Aq%QM{i8R(;-~s?{7sc>zQ9Q|{27s|yaX9V(0QYML zhmurLv+aI^?S6yPS!e)eClNp5I2?DlUpox#1Xa|`8JiV;#PRy}{E#HlSW~63S&i7x zP5=Pv+PPg6qeGF#`s4i*Lpy=&kfpg_FtiiOyke@T+375_7r1!v+Ew2|s;HTL<^?Wp z7sW&x>ris|5y$=7!3$g%IAvb3(^=@lac3%#2-%qX1;1WGkd?7n;rJ0Zt=gV#h{Qz| zHT(1Xud#f)DCSUt4QcKdoX$ee{bIyyPF*#bb7yELe7t{}q%yBqC^@$K4OCGZcy>or zU8J#g2;AH+#m5P5QV>h8(V-DfkowNi^w|Zilk3*?bWCI0rx-o2gyk^R*Frt1+uWk3M1Tra)p_} zkmO#oyPlorH*aR|{`~y@J{?8$vE3i}-#6KB_eUbx{C=`zHsdR_ArKow8v=zZS+3Sh zM-fp!xebA;ZUESX!xcel5~v&IvoQ~k_W&$c>rR0r7p^2V3G>7>Ggr^_EQ3H~ zb;GVbUFJZ{>V~OPa63@aVo?F-IVfDo!{hx`pXH)>bE~3oC6jpADOj%706IL`+4eiH`#CZ zMrR0r7p^2V3G> z7>Ggr^_EQ3 zX=WRO66SWHYNP2W(!(YkG_ju`NKK+;RCU9yJzeHN%<6`zQ*b*_(qd5o=Q$``$;0FQ zRiEXecyp_wa3zy?*eO`9)&M#@+1dHqrzNGzW7@SR?kax$`1U@DhuRi#w~t+W0$>sk bbuah_Lx%MaXNpcJ00000NkvXXu0mjfv4YZ{ delta 926 zcmV;P17ZBj1GEQ_B!7izLqkwWLqi~Na&Km7Y-IodD3N`UJxIe)6opS)rBy0|b`Wt0 zQk^V_ia2T&iclfc3avVryz~#6G$bi5j)H5!!JoydgNw7S4z7YA_ygkR=A`H%CEk}5 zTEzI^@;=Uc=WySBfWKa5s@X9PsG4P@5^*7uT@`|_=t3V=2!F#8Gxa%9Ou}=0-NVQC zyBN>%zW3+qQF0~&d;;+-(+!JwgLrz=(mC%FM_5r(h|h_~3~G@0k?XR{Z=4Gb`*~)> zNT=qBBg8_Xjpa6GMMEW?B91DmM*04X%L?Z$&T6^Jntk#YhI87=GS{hwkia6AAVPqQ zDoQBBLX38e6n_&bI*)t!2OYmiE}2{T(>lN54hX`2A*`ukQ^yM<~)WKhkx4V_V1nM{C)s0q;ia70a^$E z000JJOGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^Rg2@(kk zCBtXhwg3PC8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0gFjQK~y-) zg_F-p!+$^!#(xQ$l#Pi>F$hJ1_0WTY&C+Zk9?C46 zAUF`RJIs9FH-9#`ERXv0JaHsd-H}WJ7Bfw7eRb0RC209U-5{{0lJC5tpZX&es@AV=Q4g zPk$)#82OKDmgL4*?q6EUd4f+GE>{~qzU^T9#yjDwlDiP9k8ex6?zw&X8n9(L8g$!N zAtP+pJ)ta0rX$XZ9mi7Su~Spk9Yr2Hkapd>K7^7ifj+xG34bTVf4CnL9`0`&m`sAf z%ai)Yn=1FkOtYA2!iU!t|Cwx{)Gn{}<`=H!7vwkGJ-DyQj{pDw07*qoM6N<$g4L*^ AApigX diff --git a/assets/cubyz/blocks/textures/pine_needles.png b/assets/cubyz/blocks/textures/pine_needles.png index 35b3bbd253b846968da5ff515b5b0c50b6b722df..27292ed390f31c590a401a8ba0790fb60ba22f53 100644 GIT binary patch delta 438 zcmV;n0ZIPL1JDDIB!8DlL_t(Ijg3=HimN~n{z_~jCS)r#hzPn6yoGxY;0ZiZPT&FD zdy7C83L=7#0R4FG_%263J0AzK}0HBMI@h6fh zHD~Dq07|Nq*RKugDUD@A3@BEb*5o%W@h$@W1WbkzBP zsEk<`Ay4f{&-)8mo%8y&0l;5WqcY~(^OD;hIFc;gO!Bh5b+Vo6d@z^%z%PRsYP5*sLic%pK^#{oM gkN#ulOIGLn1GlUjp3)M7b^rhX07*qoM6N<$f}=v#761SM delta 433 zcmV;i0Z#tV1Iq)DB!7}gL_t(Ijg3<~ZiFxpeS>1H};+AZ-;T$|6NBCPgxq*`&x+p3&IvGh+ZiQs0FX5W1Ar-G#!n=5 z?#|K&0F=}@+YbwMQrPYrbf_`41NqJNVWEx+OE>QNr*@!VYJUf^4-0iZ005?TAVEv& zoR@AS9cp)ZyKfH6XR@Q6)H$0nW~n{P@#}%0-7Z&(s+2{74)sp^+RxmGaV!WFHo5 zKNIjhd-270UUJ`qK$5keNnZB1PPS8>5AKo5QV=*Sb!Uqv=DeEC0=oYIewpj1CVw*fWYcDv_P5(TIGdZ5@Wll_fwBwzyGw~ zZQlT}J$Awv`1tzde!WpS%i<#dZQn2rGXT;FVGICdZQrmx_IHElPTM!!uQvb|ACXR| zoJ}9?$;aA3D%WN!;E$1iR$8GdRG8|%t(=RhA|NR%E#Ad(yUbVkxsZ@ zZfh9tq%c{;PMd^d=GO=Hqg>6niGXst?%ekI?+D_!b* zkIgD)F_%1@1DH#mfHKvlt^&z@4U*;~`V}KZ+NT_}eUn_(3+W^=)5#p=sO(HXR1>$y z&K6!Llw*XCjHh8H(--N4=+~2ZilWT6=brMS4Kv+r&;38AwfT{y*0z0vsdF;j=#TSn z>NK53igadOnGDU2C`w-)mrgMC-;o{jqHKNub=@rrR8wtp00000NkvXXu0mjf!Nt;X literal 0 HcmV?d00001