From a9ea7a144818095065f3d0b20eafd0f739465a10 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Thu, 24 Dec 2020 18:55:01 +0300
Subject: [PATCH] Moss texture update

---
 .../features/trees/UmbrellaTreeFeature.java     |   5 ++---
 .../block/twisted_umbrella_moss_bottom.png      | Bin 504 -> 502 bytes
 .../block/twisted_umbrella_moss_end.png         | Bin 471 -> 476 bytes
 .../block/twisted_umbrella_moss_small.png       | Bin 356 -> 360 bytes
 .../textures/block/twisted_umbrella_moss_up.png | Bin 409 -> 406 bytes
 5 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java b/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java
index 5c7f5828..bb6dda94 100644
--- a/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java
+++ b/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java
@@ -118,6 +118,7 @@ public class UmbrellaTreeFeature extends DefaultFeature {
 			}
 			return info.getState();
 		}).fillRecursive(world, pos);
+		makeRoots(world, pos.add(0, 2, 0), (size * 0.3F + 3) * scale, random, wood);
 		
 		for (Center c: centers) {
 			if (!world.getBlockState(new BlockPos(c.px, c.py, c.pz)).isAir()) {
@@ -133,8 +134,6 @@ public class UmbrellaTreeFeature extends DefaultFeature {
 			}
 		}
 		
-		makeRoots(world, pos.add(0, 2, 0), (size * 0.3F + 3) * scale, random, wood);
-		
 		return true;
 	}
 	
@@ -149,7 +148,7 @@ public class UmbrellaTreeFeature extends DefaultFeature {
 			SplineHelper.scale(branch, scale);
 			Vector3f last = branch.get(branch.size() - 1);
 			if (world.getBlockState(pos.add(last.getX(), last.getY(), last.getZ())).isIn(EndTags.GEN_TERRAIN)) {
-				SplineHelper.fillSpline(branch, world, wood, pos, REPLACE);
+				SplineHelper.fillSplineForce(branch, world, wood, pos, REPLACE);
 			}
 		}
 	}
diff --git a/src/main/resources/assets/betterend/textures/block/twisted_umbrella_moss_bottom.png b/src/main/resources/assets/betterend/textures/block/twisted_umbrella_moss_bottom.png
index 4aacbd4652966936997d1cc07839a7033cee1926..5bf06f2ce4a1fd733066264b87080fc61d9b0e8f 100644
GIT binary patch
delta 426
zcmV;b0agC^1NH-uR)330L_t(IPmNPOO9Md=or@kPA?5=kN-UxrNQ^>SYYV|2U}L96
zDhm}mi5!ZpT3A^KqFw%jrP`)2#zN6T(L!U65YQM_-?)41<qq`0a<el#b8qL(8bS!l
z?Ko81a43JcFU(Xgwd-G0Ev^`&Yg@v~4Aaee(ddqmL_~fW2!AxMUI+&Z<pa@vud^RE
ze2D4EfUf{>>uhroEQQ9!8}AX5E)RhM01hskpBj%xdq%T*O}IwKHD%Nf?!jLeSy~mb
z`~-bGJ=6W}rmr9WDgdY=ec4amt1ATxpt@?5{-?&}1ED}qy!FH6)$2!~2S`97Y+V&I
znc_HndNTtIY=5UDVv|E`SLT=bpqd9XwBJtnlnCtsiddNeYSmm;06=nLI?HVIVG5NI
zl6BlDCnFInJ!f+=uA~o>kHJiZ=<fKJu98fKc-(bh^Z_4(vw}225E)DgYdkIRl`e+I
zAWSl_i00x<9Z=e<#|L-}bjfgEHNt2l{3=-<_YhE_G$T7EEuxdDMejLFR~LxB0lviP
UbSGMCfdBvi07*qoM6N<$f`~u5N&o-=

delta 428
zcmV;d0aO0=1NZ}wR)392L_t(IPh<T5|38C9YXifL>IMd_Ilcc`h5j@Ae#gjgEv1-I
zp{VIUyOadO&5|@mbU6knV1m+M0FwB6^(_NPq5is_|Gz)H2aAK)ATf{}vStuKF#rVa
z)V6~S0bv;Uc;p+H50Zll!2yN=AOKPrd3Xim(|P@jU#?we0DpPo&wEa&EGhtp0U;or
zRQR7qOOxT}vlk2x`sz@^gD3+)0A>h>(kCz<<|PaRK&Hb23fZQQ$DS~N3}6=c%<${^
z8+dqNgaJqcNF#`i94o8>f?#=&7;<1@xIm@3@;|q>FqnNYs06GKmL5O>%B#$e5))X%
z0AvW8qzJ>eYkyzCF#rM}&HPp}VAmigCalp2in6~Sc)^-M8bMgZM;fdd<R#?9gyI6H
ziwq3+7DAj0i!!JbIJqMOP|^nh6c_B%hcd7LCUM^X?3z6PK{Qkd4B#%n7G)q;aA|Ra
zoel!9xQAsv5P-V?Im$r(g(YE7K!U_!nxV?!03#M^-6a&EECz<fI*IV?3>88H3=9Ab
Wo$!8!JOA7O0000<MNUMnLSTZ*Yqo9x

diff --git a/src/main/resources/assets/betterend/textures/block/twisted_umbrella_moss_end.png b/src/main/resources/assets/betterend/textures/block/twisted_umbrella_moss_end.png
index 3568f58fb37af9d8c5fe1bbfa5286b48a3d609d5..bb3b5240cb3beec9164570b58e50f4f7d98aad0b 100644
GIT binary patch
delta 356
zcmV-q0h|8U1Kb0URsnI5S1*4*pM3bQ+S3f?gA4*2JZr*#5RDA58t~^cGXs|fFT>x@
zKj9&)RA2L-RgeYBLjVi|K(TT?wS)<1(SLRseuf`!nf`+`^Jt4R{C@ujstN(%MuMCN
zvH_$BXb8xiObSI!|JkJ^82)^D3|4bJy%5#?Kmd2awX_1pFIQhOfDC`pUp)mSaolZa
zX8d{U4WoKXJp%|M1B`^E+)xV^`1^^K0c87^Yu6e0E#$!lgIou)2&@nYuqGssZOEEM
zJe9$kL9RpA3<D@GaJtCAaBm^R-#?$dV0h41hhiHH+^B}IF<h`uAIiW2m_!Bsv#W{x
z2hmU=Fo3%NITk*ic*t15qooOU1(yaN*b5*4@&?F@U=9$VxBxj8K>h~#ALNy9H$H(i
zqHBf$j9933Q-rb@7#8a!g2UrxNg9Sm5YT9CU;qFbqNI*jq*N;a0000<MNUMnLSTYF
CW|s{B

delta 351
zcmV-l0igce1J?tPRsn30S1*6Rp1=98+S3f?gA9Ti{2xRk1FQ!8`OM6~sVd0u@7q^+
z2rD;L{AU%y3~;OlTu&`w0$TK+O;VWQ$6KcVAkEy`!VJIPq1p}ta05Wj(_h!~UvqX3
zFlPTVTnaB^`gZLb1G|(2R0Y^z3=`l6TuUit{Cf2*1IU>mgP_7-aHoH^o$=@OFO2Ff
z^$Z}43@{RsN^>Px;Lm$bu<c*2U1#98k^vhG@&d>rutFffnvg)YA!`=#kp^o9xei$~
z44}Bc=^_Key@gHxL7IO)d%^IauMWjF7`RalVPm*ppFWg<1u%*8{%6<Z`46I@LSO)Q
z0Voz={``3C2?LLoCfHLITw2^<FMt5Z8z3)&IY5Bo0_0c#`5WYakXOE4`wG^Gt{Da}
xVxiVe5z1m<Sgex>4v(89X&4$oK%=#R0RR_vrn&^nO1A(2002ovPDHLkV1gAGo`V1Y

diff --git a/src/main/resources/assets/betterend/textures/block/twisted_umbrella_moss_small.png b/src/main/resources/assets/betterend/textures/block/twisted_umbrella_moss_small.png
index 82d1c7e6686205153ce8fae66ab26ca6c3e2b874..31630fcd2177f0cab2bd37594858e7bbbb2c0bc0 100644
GIT binary patch
delta 283
zcmV+$0p$MV0_XyeR)76TL_t(IPh<T5|33pIfC);I4MvIqD$SKRLz<ugAkEy`!cZP2
zAlVD(u7Mk%HK&)T1i>aL0%bt}UKhZe|N9*yRD^+nRp>v8E8qtF`@zbfzpe+x6)@XC
za>#&1P!h^QGT_I}cTg4rfHeNN$H(yb+<mABP#ututQN%!Ab&|1P{?ig|NjRE!_SA$
zpdt(m(n*D27ykbG5zGexCJEm}6hV+iFarrZo!1Wz1XgZ-6h25V6B8c~SQAL_^ZCnQ
z1t9QXaswmC_FwPbg85R>xnP4~YCw8GdYPUroy_>-!9%bBG8?Q42>yNg0;bu7gc(3`
hAT=O)2zxRk02HCJbTTBSMm7Kd002ovPDHLkV1gacdI$gj

delta 279
zcmV+y0qFkd0^|aaR)6_PL_t(IPh<T5|33pIfC);I4TgaMjE)yD1M%6G1~4t<1EC*n
zs{GHw#LfugBLfzgVi-VI1k%i{EzI!q`WL7ODqsR>fMI+9CJ!<Y%zy%L80^z$V0dx5
zm#756CMg1@L3%(KXCU6FZh$-g_d7<YC<6nl(0>$HFd>HlyMHDRSOVr;m~H3)SsWY&
zgut)oZ=ftp0QQ2@MKBu$s5Dpp2RRqn`7oy=8_0w%h%GSX{Mx~$z?=@^gDeGE!UPh0
zd$;F5NDyQj$X1vlFaro+u>_L)di5<>45SC7mr263m=Poh5`eLhT>*0$Of$$}kXjI1
d!nBwX0G8E%>=3%&=o0_{002ovPDHLkV1hDvbAJE;

diff --git a/src/main/resources/assets/betterend/textures/block/twisted_umbrella_moss_up.png b/src/main/resources/assets/betterend/textures/block/twisted_umbrella_moss_up.png
index 4aaf0e9bd4b005f6a6fda82cda8b991b6745e4cd..1a1dcee84996a52c6efb5a3544045ec7b315205c 100644
GIT binary patch
delta 269
zcmV+o0rLKt1C|4jRsk!KS3rM$K6}ByE+qlwVFz#nv}R5CufKZAe-I57A_~9_xRzGH
z_~q(L23A2929QBeVK~reZGdBBzz9kZ$UwQF7A)}h6D!#HU#?we;J1(m8~pqIAFxGW
zg+Kr@3?mHgHZ(ILYZmcT25Sbn4p}n{pt!*4A_K#{g-!oKnn3~hps#-p#WonYQ4L{Z
zxL}_?lz{~>i3<E@R}=XUqM<@y0Cxc>^kM$|c;X=gkCrCb6<iv8U@w3G$QvLpf;m8d
z;sWGY0Qno_e~?$c-S`C7h^`q1Fk+$BO%cjsU|6h^2o8^%C21HMK|rImfdK#`rKy-E
T)xs(O0000<MNUMnLSO-cIuLF^

delta 272
zcmV+r0q_2n1DOMmRsk-NS3rNhT)WP|E+qlwVFz#nwC42w*I(E3A4Efi7+3`ap)A}0
zZosvaV#cpm-!iZY{bv9f1Qmt@jn)P@Mh1+a1c3}xnk&Hqf8KL~oe%N`zm*Kw;NR~U
z!4`oP0s+V{j4-%U+s=rrS;R*gtQq7wWX&*u;sU3O3=H=cHvI=_{`r6G1;c~BIuzSr
z;6^osjp2fQ`cMWIz$DK5pIwvZKZu43fdSkFpwNf;^W(863_MzzU{`Qyaf7`80w8aI
zya?t10g4NdV*%uESQ_|t?JHO#x@H)_h=p1=MJS7bVX;mkI6Q8aq+w_T0gcuM1^{F`
Wt&CUd`_}*f002ovPDBK*LSTYb!*%Nb