From df7220af8671e8687d8bff021876f8bef1a0b628 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Tue, 9 Mar 2021 18:04:57 +0300
Subject: [PATCH] Cave grass retexture, stalactite update

---
 .../betterend/blocks/basis/StalactiteBlock.java |   6 +++++-
 .../betterend/textures/block/cave_grass_1.png   | Bin 422 -> 219 bytes
 .../betterend/textures/block/cave_grass_2.png   | Bin 368 -> 211 bytes
 .../betterend/textures/block/cave_moss_side.png | Bin 604 -> 273 bytes
 .../betterend/textures/block/cave_moss_top.png  | Bin 710 -> 243 bytes
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/betterend/blocks/basis/StalactiteBlock.java b/src/main/java/ru/betterend/blocks/basis/StalactiteBlock.java
index d4d74dd4..13e09a69 100644
--- a/src/main/java/ru/betterend/blocks/basis/StalactiteBlock.java
+++ b/src/main/java/ru/betterend/blocks/basis/StalactiteBlock.java
@@ -21,6 +21,7 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockPos.Mutable;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
@@ -195,9 +196,12 @@ public class StalactiteBlock extends BlockBaseNotFull implements Waterloggable,
 	}
 
 	static {
+		float end = 2F / 8F;
+		float start = 5F / 8F;
 		SHAPES = new VoxelShape[8];
 		for (int i = 0; i < 8; i++) {
-			SHAPES[i] = Block.createCuboidShape(7 - i, 0, 7 - i, 9 + i, 16, 9 + i);
+			int side = MathHelper.floor(MathHelper.lerp(i / 7F, start, end) * 8F + 0.5F);
+			SHAPES[i] = Block.createCuboidShape(side, 0, side, 16 - side, 16, 16 - side);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/betterend/textures/block/cave_grass_1.png b/src/main/resources/assets/betterend/textures/block/cave_grass_1.png
index c5b44c18d02f14a4b0c5dceb03d8932c58cd613a..a1acac74d21fa849c5edaacc25f1365478d7651e 100644
GIT binary patch
delta 202
zcmZ3+e4BBCWIZzj1A~Sxe=v|@EDmyaVpw-h<|U9L5#STz3Z&=Ac&#x=n&Z>mow}sB
z^=#I{XHna}<!^F450v953GxeO_zwYBPlXr(#bP~O9780gmi7kn9WdZ<a?N>P|Ah1G
zwsj|eIX+z}@$vUFn?EZ)eibZjT0X7kR+W--=pM(`%ReTq+j{KQ-fJgBm)~5eXB;MT
xT~O`U`yDDSZ)IELa<k;GO;IbTR=LD=nS1&&Mtj|5nIIQ3c)I$ztaD0e0suv1S6=`C

delta 407
zcmV;I0cif)0j2|x8Gi-<001BJ|6u?C0c}Y{K~#9!WBC97KLaJ0fo2AHZ~D*Ry5={7
z*T(<<{kHyR@L2y3zX8}l_VNG!L)QPrDoK<95sN?k_uPP8jwl0SramCvfasmyF%;)a
zxcR?&)ibPyU>E>Wl)CLRhT`Ie<Nq7x-oy~cYC!aq`xpvA{C|ehUH`i#pGT3yFraqU
z_5Wqfr{Ic$=e>rj?#*8Nzddz1egjIg)}tthoOBn?nH)Lu|Ez=saCuO8c`f~nYCvcD
zN)!V?ftTEV;s3n6)&G}<O!`0Bso_7ex6<an`j2A3EYJ4;OG`HVM^0t)<L3O|;MMlO
zUoHIqR>eq$(0>JQ;qpcG$50KJq!Ialv2Er5wOPyHiq@Fq{huP|1J(?}g;Vc=<z`fE
z|34vY8ma*x1*?s7|8KG?fg7++E&l&Z30JrQ&GT>n2Wej6RQG?Sb3Frw0lU=V{x1}F
z1Zx0^?a@g1KUc&a&IkD&WawOJkN+Dq62TS$09;lBfe_^;pFscs002ovPDHLkV1j_Y
B*B<}?

diff --git a/src/main/resources/assets/betterend/textures/block/cave_grass_2.png b/src/main/resources/assets/betterend/textures/block/cave_grass_2.png
index fa6e0ab9d5ac59435cb2c99d1e36689025c4f90b..493e7c0fece7f4212c9c0ffed932a30e8f813bad 100644
GIT binary patch
delta 194
zcmeysbeVC2WIZzj1A~Sxe=v|@EDmyaVpw-h<|U9L5#STz3Z&=Ac&#x=n&Z>mow}sB
z^=#I{XHna}<!^F450v953GxeO_zwYBPlXr(#X>z@9780gPVEikYcSw&_U5kmFCA@S
zSRC&)ZS9`D3?H^uv43rsv3@bT<mu_ysuk94UgxvY6pyBM3H>X7>S6aTsX^EKn{0*>
nn~|e0htVIOBP=mT${(<lnlq{=*vh8?ZD8<p^>bP0l+XkKgAhuO

delta 352
zcmV-m0iXWU0q_El8Gi-<001BJ|6u?C0XIoRK~#9!WBC97KLaJ0VVD{K0#QppF+?o>
zzz{s|_5bii?-}A&ek08VF;gFaapa`C|5N9^WC)*dn>;U6uX^@Bx&6X_f?fz+@D{5g
z&kg?>iW`pqCn^jIr{4RI&47l|UBnsCJpcCpoXP_ziYIj(`G4P=y_PrwK(;lO?S?C!
zR=M^6<j9%-LE;1r0NM^VpeJY&+<^IhJz&isoDB>HAZEy1^Ag2CxYI!fEG^maf0}DE
z+<>Y2*<i&W`H=O0!3Lxh?f{Fy0Z1W8BglZoww3?;)WZI6Rg8ofpy2m^l~K-rm^{dU
z?#$Kydz%mZM_Dldq-kAX-~Y9$abV3b13>f!jl}<(wNt<bz+5)RyA#6zhHXkw{}+in
y{fB9U(Q`%Y|8G~02Dt((w%)w(|0G#&xB&o-Nu}Rul=Dmg0000<MNUMnLSTaLmaD1&

diff --git a/src/main/resources/assets/betterend/textures/block/cave_moss_side.png b/src/main/resources/assets/betterend/textures/block/cave_moss_side.png
index b4e4b63aa74d6168942bbd7ef8b8521174aa4a9d..1e07e4c29730f5cb009eaf8dd204d66acaf78534 100644
GIT binary patch
delta 256
zcmV+b0ssEo1d#%e8Gi!+001a04^sdD00DDSM?wIu&K&6g001gbOjJe1zKhMqi`Ckc
z-sYt4_O$l;y_6h5q#R1D97?ntQoSTn#VA_MFk00(Vua=gBme*al}SWFR2Y>dO$m-g
zF$lutY3p+T>kj>s7!?r2sk7UCd-u+CVXKH|i-=rfr@HRGF?q|v%$%Bkg2#(K6<I}a
zx~ndd0i8vzd36Itf{{T3Lnl!gUD?R#iQJ$C{1wV~4J3fDNCPA%MPX0~byr0|)g0^!
z|BS1!DY0{i6RW8iob)Gxht&N8wNIasg4^4Kj-Sj7`u+g3(+0k6Pxpub0000<MNUMn
GLSTZ+&2eu4

delta 590
zcmV-U0<ry(0^9_U8Gix*005AYXf^-<0wYO8K~#9!U69Lf5>XV!@84mO_hUo|Ln$&1
zQi_j67h14ofEg&m3=@XG#D$u4!OERUT{LN$7D<aB&?bcz<ynfgq-Ej4rOPf{dGI8Y
z#$@K?JLmlFm+xM(aVK<OWOuZY3xDqC<NP7TRjF7}w|aCxd4IjE3>j(fZlpgib=*RU
zTB}%jGG@fGA=<DdzAwscmvBUJeUEhMmn%kg_&{va>8~!~I+*V>Qc?Tr#E~LbL3yws
zeKE)DRI+MG>}n&EK<+B2G-<wSW1Egt*CUJ>`Ph}}(89%HmQ0tGGp{i4W(%4pB~xtV
zlc%Bl4}Z2pr+>E$k%paX)0t1E=)Req1eB{Kg&g1GcQoO$h5M*|`N8nw(8kp)iT;9E
zHn9g5c6)B6?%*2~x2+FD$f9nI6im-rj`XQB^^MM)IFj!)p)Gynz5aQ{9NRZX%l7!t
zFE-ulH5<353BT1nBA<;AbiHNgd-Gz~EuJ${#lpccxPNQUli9Vd)?A6phsq=%1F&Iy
zO3LQM>$xQ$PMv(i8viHK&H5V<XFjpviVwUJX!u4<4l02k9t()st2qTk$CCnxb4KoY
z1$b-FIEPA5O@D1d-88I#z;(AZn~!`md(dbBTY?Hks`u}k5>%X{E4Dzxil{vjFuM6u
zgB`BXOGj;iA&5ewj(`B6(&&wK770<L!5avScbh{;1c>Sf4W_ys8ja8tw*)h&dHyq2
c@1Q393%AF#yvsBAKL7v#07*qoM6N<$f|D~Jg8%>k

diff --git a/src/main/resources/assets/betterend/textures/block/cave_moss_top.png b/src/main/resources/assets/betterend/textures/block/cave_moss_top.png
index 1d3698b27d0636d92874efdfda9d20e0492c1a8a..f2857080d3620d338e4a60f909d6afe84bcae42e 100644
GIT binary patch
delta 226
zcmV<803H9v1@i%r8Gi!+001a04^sdD00DDSM?wIu&K&6g000<JOjJdb96_WUN~|18
zv>Z~sBvQpFTFo$8)i`2S<sI|@004<eL_t&-l@*Tx4geqs0yP2u|KrZBR+5}lrMGL3
zcPDYzO4M0Vp{X{qX79+dDt0TI6T~h*RZA4lmZlm2J!r-@Ra<lg<QagbOFck+L%?ln
z{l>Gcja6Pcnlw@0;EqeQ2C^UI5pRR@lA&E9T)_E;g~oKEU##dg4}>d~1Ph`sOGwJ~
cCLbEh2Y0Xpg9D^>qyPW_07*qoM6N<$f~F-{QUCw|

delta 697
zcmV;q0!IDw0mcQ88Gix*005AYXf^-<0*y&TK~#9!1;M#)8%F>D(79*!=JJw6QFh|M
z7K{KX+#9e9e?rOt`GfpQz9~hDlr93;iDbtjDTx%h=j`mx&XM=v@2mIMVxi3V`f3>o
zbi1uaV3jgi9IO{{+mBzjr)P_)_4Yxv%yIPL+4s=<JP_Ww`+p||0hmYe^?Eue-FCX~
z&BZiJ6NWi<ol6)(oa6IZYOQ}LRNW0lr=pNxf}@n~tJWBY3FrqSm0nHLNx~6=7(qMF
z<G<U7!MPtU=7b<)3<u<-NA0Y!@b*yFa!3<FDZxJn*LTNeu)sSn;mAgKs(MPuq3Srs
zRjUZc9HLtHs(;n@g~V^N%a_S4pl}hzIiY_wI|9gUSLRqa;CaNBlfVK%J?{GcA5`Ms
z@;8hU;2fg_BYZubngOIZ$Rm-4{Mak&{dt^ZF$tKs(+%<n|51E>XgWO(wd}rZi&Ri=
z48ed9m<4pk!lLRPk3D7dZMH@)R>`~kx$$maDZzz9@PBHRo^-b_B!W0&V$ing^q=*&
zqH2>^pxvXq>FdS~i!8lqi`MB=(OyL9lN&H56ydwNjzh7=X%YrSrSLEFA74yT+32%L
zvIv43Sx#^iGRPs{98O<U9Uyj8Z3LMd^hTEW*Q=lQM|qZK^IRZ=*Z|v3t<Lgg&WFKW
zMu~tRWq;yPONjAzvm6D6zPy}|<EZ*EiNyIlGv0S<+#NdSd>D#63n4^H9+s|utXs5P
zgi`5`!(n%9KYrR;=dR}2{juIWm0MYtwTct5K2JEJ6GubF$bXyDUa42X40%uha|xhz
zF3gx}>~oPdPJjA#h!{@-dN6PyLbQ|ZDouK4FfxZ{BL2MHe=Z9=0^i%1(~R?tY@o;g
fR;4xW)TsXfolkG}kTVW%00000NkvXXu0mjfx-nZ>