From b91d8875f3161d9ee79118418b0dfa216dbfc75f Mon Sep 17 00:00:00 2001
From: kay27 <kay27@bk.ru>
Date: Thu, 17 Mar 2022 04:39:53 +0400
Subject: [PATCH] #1976 Make river water 20%-transparent

---
 .../default_river_water_flowing_animated.png    | Bin 601 -> 700 bytes
 .../default_river_water_source_animated.png     | Bin 423 -> 508 bytes
 mods/MAPGEN/mcl_structures/witch_hut.lua        |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mods/ITEMS/mclx_core/textures/default_river_water_flowing_animated.png b/mods/ITEMS/mclx_core/textures/default_river_water_flowing_animated.png
index 9e126d3c1f488b6c1347b3ef51971c644959b6c0..1ccc0cba16b725bf0f6c1ddf29f2ac8f174ab0d3 100644
GIT binary patch
literal 700
zcmeAS@N?(olHy`uVBq!ia0vp^0t^f+3@pq*mXynpTR@5>-O<;Pfnj4m_n$;oAfL0q
zBeIx*fm;}a85w5HkpK$H1^9%xDi_wO);4RE*XdL@=ydex)-~%lwHkJG8g=*l|Nq}>
zXKpS?dr6RA@EI5oh_}}P3Nj{nySs3Hyt(uZ0|S$gr;B4q#=W;U9J?MH2(&(2KI7c3
zdoG-NOY$CQi<~$Z?aVhpCQ(5=<3;oNq@K!-%!Q%bCAO@7>b`bWT|`4-!$Dp#Hs!SC
zt&M$_s>i-hDOh&Ar1OZPOMkaCA4iPrfrAZK87?F$^Awm%C;C?u^)=4_;O&*&BmY3v
zXz3RgHnnm;4rhf<&W9Wf23wxpY-4}J!7TD@s=+;xvU3R{60F~}4&C}#!&-g7e*;5n
zrD~6Q>sd)1&K{=Uu`yTpD;XNsy5113Tg<A_Gu42HYqs$W?lp$z%>ohxZbY=y9+-Ya
zLbT0Gf(@u=jpTW|ImQw!Vk~B2iSr*EO<r^;fb(!*;@S$4W96-~Mj)9o-9z&Z7*_dk
zIX_(#^<he4X5fuzHsi*b2iCdXV3uHd$(8(c(Z0Kz`Qtc0&pvd|Xa?sQ)-wG=Y7ba0
zT$q<Gt@eQp?D9B~Z`#d)37!e-mDb3f58uF9XABmHIIo9kx48J%;CTugwsKS-5?60J
z6v26T!3N7_)kf22H`%y&n4-Hk?BCC`80fs)^{chFO?ON@Tk-AToP$0IY8y6k+@5dO
z*y?rTU$p7dpU*FUe^j<en}?~mvDfv+zb~9RA$qG={Zrj`sGsFHVRT4EGI3(hfh0G9
w8KHWwZrkqt|K;E1-~R9I@iP8g|NER@XThqti@jk}fk}nI)78&qol`;+05#$!-2eap

delta 576
zcmdnPdXr^>O1*S|Pl&5(ZL@M=txk1=PDhV!U9(YlkA73DR(YLaM`wQOn<NGX#-E-p
zjv*C{XRaG&y)h7JeOSD>Gk&%5p&j#NV|L72$$Qg5LHffRg?k5^bN*N+9CG~7;#FGz
zbF011<%o=e#ZQwCJhEWwQ)PN-$|PRVrO8<AH}75EjF}s)I_qzqxax5r)4I1{`}`XZ
z9^Npvdl-CV)+KfWRhJ`dVlCErCsdgq2!>Bu!u#CvG3V|}9<7z?Jp8S(S`sX5jkV?p
zhbyEusQ+o5w$k8z%R|>hZ&vO`$Ao&>$CVz9YkhC9)j!~9T_}8P(T1f>I}fmZp2OG}
zm{2YJjd8#Hh9w4NhayDkw`t_4oX?NZl3<<2y3IUs{(+JM3xF~eu078KCE`TQ!VS1|
zxZkYiynWy`BX{dYUg=Yp+m6O2=8K+TNn`q*b!c9~$p&p6F6raS59b=xYrI+8H1j}A
z!h7Evynh@ekAI$1$Sh|Plz5Nx@RAMoqC8C8AV)v0_{YEdpnTerLwo9Bj#JoB-q`#2
zBvbV44ZL;b2HHGx4a8b?MRi!rW<2NN=wXVE-takfg2*wy2tBT77PBeO&Go=exGilk
z)2{I;Q24_`o3FCmIqMQcW^m`^A4vJdGEI8JMVs6RAFkQj60FadKuQA|XC7$#^e6i`
zUkU>duvz|$zW-Re=THCtkM{r4|JwgM{{M&k|Ht(Z0Vs#5a-N=(mbm5>kQPr@KbLh*
G2~7ZhfdNtg

diff --git a/mods/ITEMS/mclx_core/textures/default_river_water_source_animated.png b/mods/ITEMS/mclx_core/textures/default_river_water_source_animated.png
index fb8ae17bd7cd73950b6765bb68e602a345e6bc61..fed805264d5f3ba4bd6913408a10ce47d3b47b24 100644
GIT binary patch
delta 482
zcmV<80UiFQ1N;M!B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FcU01FcV0GgZ_0000C
zP)t-sBXNBteS<EBj{pDvE~v;U00003bW%=J%*@P}UcDm#0004EOGiWl5e!W70004M
zNkl<ZI8TMtF;2uV5CzbQg;7XF;k77Jp^#HpDX9Y5%>gL)6o0cT8aj?(p&;!snVDE?
zBiqopik|%Q^8<Rq9`q3h*d1|%gTe(Sm={oZ(4be-z_)K3`0U#buz#8X7j$q@0MLOm
zba)R6&U`R6Z4@1ocr$xMDL%AMJXP>4Jy-PPYIH#K_6=Q<y)}9RUDC2=#RKt7@DzK`
zdDP$;_8uAv9e+IzZBKkj_LO*zJ@g>2Zj1UBqrQZw!E41+9Qx`>XpqoX&$CCDB(JYW
zRcqpPp_Kc)l-wKgs3t_!K6-a^y%g=(n-XuVM-3iReeXgkw|Ob@5)Y$z$ew(9?7inv
zgNNclrIal+c`AB4{YO+Q9*AfEDMcmIxM}jJgDZF@EnCIqrIe;tii(qXGCJpzrO@}6
zm7=jQwZ}Z_B^mKo936RGEM>pcr&fwu{V9}6NvHM^riQPTsN0Bt{}j?v+NM6WEb7_+
Y0HWCEVWFSSg#Z8m07*qoM6N<$f{EGGnE(I)

delta 397
zcmV;80doHQ1E&L!B!3A|OjJc9aeXCygD!@SDW4>500045Nkl<Zcmajffo8-&5XSK@
zqg!b}k&6NXD$P@@01DE&%L5$Xo??0m1^Ni9QtmOE8Ott{Ran5!{qHk@o4AL&@PNaG
zN1TWkOqdrCpB&uUR`?Bdh3~#@!2Qb%UfAPC02=sqdqM!=Du0hqlTz|b>doS96hXX@
zd9>qopnXp$d62wg1!D2m<P8nD6R%Sb>b21$@m_6e^jh(rD!9z6#ru#SDITfk#p9rV
zT}(Zv)Hk7$SF1-`bn-MB5}mvt-ZhBVms4rYye5wFXh*T$U{l+e>O%4!=JF`ci#KK7
zSV&EtP<`*?D1Y~M6sO*(9*Z|GG4<1?Mvv7)VHAxPkCJzA#Z;lhgL>URqfmAlca=>Y
z{EpY=qj)olIki$MPwIK~LUt*KvmM3p&Z#}y)LVAMKk4W;uSugEm%^#p)bdBcj$%*k
rYmTY!g;b)<8_g)<6;92hiuVVi*ymyM=1J%P0000<MFvhpu0mjfM_0rb

diff --git a/mods/MAPGEN/mcl_structures/witch_hut.lua b/mods/MAPGEN/mcl_structures/witch_hut.lua
index c5a683ce5..af88e1f49 100644
--- a/mods/MAPGEN/mcl_structures/witch_hut.lua
+++ b/mods/MAPGEN/mcl_structures/witch_hut.lua
@@ -48,7 +48,7 @@ local function on_placed(place, rotation, pr, size)
 	 		if not nn then break end
        			local node = minetest.registered_nodes[nn]
 			local groups = node.groups
-			if nn == "mcl_flowers:waterlily" or nn == "mcl_core:water_source" or nn == "mcl_core:water_flowing" or nn == "air" or groups.deco_block then
+			if nn == "mcl_flowers:waterlily" or nn == "mcl_core:river_water_source" or nn == "mcl_core:water_source" or nn == "mcl_core:water_flowing" or nn == "air" or groups.deco_block then
 				minetest.swap_node(tpos, {name="mcl_core:tree"})
 			else
  				break
@@ -101,7 +101,7 @@ mcl_structures.register_structure({
 	decoration = {
 		deco_type = "simple",
 		place_on = node_list,
-		spawn_by = {"mcl_core:water_source", "group:frosted_ice"},
+		spawn_by = {"mcl_core:river_water_source", "mcl_core:water_source", "group:frosted_ice"},
 		num_spawn_by = 1,
 		-- flags = "all_floors",
 		fill_ratio = scanning_ratio,