From fa9ce11ddd5a816161e57885b4ed0feabd05172c Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Wed, 19 Aug 2020 14:12:51 +0200
Subject: [PATCH] Move potion particles to mcl_particles

---
 .../textures/mcl_particles_bubble.png           | Bin 938 -> 126 bytes
 .../textures/mcl_particles_droplet_bottle.png   | Bin 0 -> 164 bytes
 .../textures/mcl_particles_effect.png           | Bin 0 -> 137 bytes
 mods/ITEMS/mcl_potions/lingering.lua            |   8 ++++----
 mods/ITEMS/mcl_potions/splash.lua               |   4 ++--
 .../textures/mcl_potions_droplet.png            | Bin 85 -> 0 bytes
 .../mcl_potions/textures/mcl_potions_sprite.png | Bin 1181 -> 0 bytes
 7 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 mods/CORE/mcl_particles/textures/mcl_particles_droplet_bottle.png
 create mode 100644 mods/CORE/mcl_particles/textures/mcl_particles_effect.png
 delete mode 100644 mods/ITEMS/mcl_potions/textures/mcl_potions_droplet.png
 delete mode 100644 mods/ITEMS/mcl_potions/textures/mcl_potions_sprite.png

diff --git a/mods/CORE/mcl_particles/textures/mcl_particles_bubble.png b/mods/CORE/mcl_particles/textures/mcl_particles_bubble.png
index c64ceea39088ba890107a6c0adf686899539f8bf..a29c95bbcb05900cf2194f2aceeea3900f568b36 100644
GIT binary patch
delta 107
zcmZ3*UN=E9m5G6Y!8=#;4g&)NTS<^#FasFmEn}a^z`$Va>Eakt!I-ST6Bb)xRQ<j6
zpJ??3*M~VfWSm4|`7)Shxjf&a%TejWxk6@{h7+F#i#RKT&pU;L8?LhiK<0S5`njxg
HN@xNAB7Gj$

delta 926
zcma*U=TD+{007`$?>^Kfm*&!bX`5?vHEm7q&fGPzBQ6wiAc_n37B_B1+_)7SC~i^Q
zim!?TH@FqIqKJF%y>aW?f1%G427R6KBl$G|;A#rn2Ec2etA$eq06-8V6bh+SDh$I6
zu7JX9q_KFAV4J}e&{({QA@0uRViS~~`Q0bshkpqYk`!hmPEUvE?le5ula?I+kf`xk
zk9-zMz1#%cTmIcI{Sl!kC;jOogTeUa=XYYUn9t{raWXe2q1(eDaz6&e`sZ_;^zVo!
z+J|JX_l}qlCrbsHFT_9IzfqTAQUdW(zy4_(jgExytO+SB5r$!rNW|fA=yW=XM3R-2
zm6MZ`mzP&iP*7A<L?94KN=nMg%19(qMMVXLLaC~%s;Q}|tE+2hXrR$(O-)S<2BW2=
zrLC=v#bR~HIy$<#x_Wwg`uh3?1_n4B&d|`%$jHdp*x1Cx#MIQ(%*@Q(+}y&#!qU>x
z%F4>x+S<m(#@5!>&dv^x$J^W6J2*HvIyyQzIXOE!ySTWxy1Ehw1UEM~cXxLW4-ZdI
zPcJVoZ*OlOA0J;|Uq3%TB9Z9t?@uC;0s;a81Id9wK|#U6!66|bp`oE+VPRx4IXpZ(
zA|fI(GBPSEDmpqkCMG5}Ha0FUE<Qe<LZMKp)P#hD#Kgp;q@?8JWEzc@l9G~|no6hB
z)6&w?)6+9DGBPtWv$C?Xv$Jz@a&mKX84N~VUS58FK9k8TC@3f_EG#N2DlRTADJdbB
zmX?;4m6ey5S5#E6Sggv*N(h3gs;a81t7~d%*lc!fZEam$U44ChLqh|H!)a`6Y-(z1
zZf<UAX=!b3ZEI_5Z*S*vxjY`Pqobp<v$LzKtGm0qr>Cd4x3{maufM;4U|@jH=MN4J
z4h;<r4-b!wjEs(sj*X3tkB?7~CnhE*Cj|n*)YR1U^t4bYoSB&siA1xrvvYHE^Yily
z3k!>ji%UyO%gf6vD=Vw3t7~g(>+9<q8ylOOn_F93+uPeaJ3G6(yL)?k`}_L`2M33T
zhet<8$H&JfCnu+;r)Otp=jZ1a7Z;b8mseL;*Vor#vH0fZ=JxjX?v8wSe}Dh*@bLKf
z`1JJj{QUg#@&dy!e-Tjz0Qk#KA8P<$7zP9a0sg<(Y&QE_$yeC`fZxz4Wn4fW-bU%w
yyF81xKgG8d%483G<0yed^}P9lc`NzDXNl6UzTW^mXJ&T?005v>u_!juCh|Ws=oz5^

diff --git a/mods/CORE/mcl_particles/textures/mcl_particles_droplet_bottle.png b/mods/CORE/mcl_particles/textures/mcl_particles_droplet_bottle.png
new file mode 100644
index 0000000000000000000000000000000000000000..77eec0691bea196a18eb6bdc2bf479f44cf05aaf
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0y~yU;weXIM^5%7<!G)?`2?MU`z6LcVSRx2xMsBO6fnt
zz`(#+;1OBOz`!jG!i)^F=14FwFtC?+`ns||;SlEGGI;he@fZUGgQ2I3V~E7%<OB(u
z2WMs)KTJP2htpj=-6eR+sRIWTc%Ryt8XC^zot(Vr$g7YQC!1Lr7_6rY@VNiza${g%
OVDNPHb6Mw<&;$U>j4aat

literal 0
HcmV?d00001

diff --git a/mods/CORE/mcl_particles/textures/mcl_particles_effect.png b/mods/CORE/mcl_particles/textures/mcl_particles_effect.png
new file mode 100644
index 0000000000000000000000000000000000000000..259e03c5deef04b7c48a4ef185245bd7a1d3f4f1
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0y~yVBln6VBlh6W?*2D&Yq(S5(w}Kab;j&m^pLinKNfj
z)Y$xFU|?V@3GxeOaCmkjje&td&(p;*q=GRyA^Ok(g##xJTrfG<xUhL?<HEzN9pNSh
pI}9ugEY`A|GBhwK@J(P~Sfj(CpS$<kR0akH22WQ%mvv4FO#qHFDN6tV

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_potions/lingering.lua b/mods/ITEMS/mcl_potions/lingering.lua
index c74143233..cb327accc 100644
--- a/mods/ITEMS/mcl_potions/lingering.lua
+++ b/mods/ITEMS/mcl_potions/lingering.lua
@@ -29,9 +29,9 @@ minetest.register_globalstep(function(dtime)
 			local d = 4 * (vals.timer / 30.0)
 			local texture
 			if vals.is_water then
-				texture = "mcl_potions_droplet.png"
+				texture = "mcl_particles_droplet_bottle.png"
 			else
-				texture = "mcl_potions_sprite.png"
+				texture = "mcl_particles_effect.png"
 			end
 			minetest.add_particlespawner({
 				amount = 10 * d^2,
@@ -141,11 +141,11 @@ minetest.register_entity(id.."_flying",{
 			add_lingering_effect(pos, color, def, name == "water")
 			local texture, minacc, maxacc
 			if name == "water" then
-				texture = "mcl_potions_droplet.png"
+				texture = "mcl_particles_droplet_bottle.png"
 				minacc = {x=-0.2, y=-0.05, z=-0.2}
 				maxacc = {x=0.2, y=0.05, z=0.2}
 			else
-				texture = "mcl_potions_sprite.png"
+				texture = "mcl_particles_effect.png"
 				minacc = {x=-0.2, y=0, z=-0.2}
 				maxacc = {x=0.2, y=.05, z=0.2}
 			end
diff --git a/mods/ITEMS/mcl_potions/splash.lua b/mods/ITEMS/mcl_potions/splash.lua
index 2f7fbf77f..fb47ebd8a 100644
--- a/mods/ITEMS/mcl_potions/splash.lua
+++ b/mods/ITEMS/mcl_potions/splash.lua
@@ -68,10 +68,10 @@ function mcl_potions.register_splash(name, descr, color, def)
 				minetest.sound_play("mcl_potions_breaking_glass", {pos = pos, max_hear_distance = 16, gain = 1})
 				local texture, acc
 				if name == "water" then
-					texture = "mcl_potions_droplet.png"
+					texture = "mcl_particles_droplet_bottle.png"
 					acc = {x=0, y=-GRAVITY, z=0}
 				else
-					texture = "mcl_potions_sprite.png"
+					texture = "mcl_particles_effect.png"
 					acc = {x=0, y=0, z=0}
 				end
 				minetest.add_particlespawner({
diff --git a/mods/ITEMS/mcl_potions/textures/mcl_potions_droplet.png b/mods/ITEMS/mcl_potions/textures/mcl_potions_droplet.png
deleted file mode 100644
index e85767d321eed3e6abdc309e04a13af21c7233db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85
zcmeAS@N?(olHy`uVBq!ia0y~yU;weXIM^5%7<!G)?`2?MknwbJ45?sDmT-A+W~MQ(
nf=_^;(J~LkWmlWo85qu&D{bU{lz5JTfq}u()z4*}Q$iB}^WznO

diff --git a/mods/ITEMS/mcl_potions/textures/mcl_potions_sprite.png b/mods/ITEMS/mcl_potions/textures/mcl_potions_sprite.png
deleted file mode 100644
index 17391b1fd60aebe926edaadfdae5e5895c6b2b34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1181
zcmds%y=zrb5X2`0;U$>ZSQ+dCL7PRa1Puu$B9EAlLa?xL3M=uYl7JvK!Yf3um`>E%
zLa+=d3L<P_E0$K4#?oSBuK$3Y;KC^m=bYV{-(2pat?}iB`BU=%7B)B5wgJomm><mo
zxc2qo6qv=<)!lWZ3Lqe$0cTf*B1))6IfpEepuh&5yDEr~poW~MU1*|(ZnR;*1rrwB
zu+uoLS$W(AXHJS$s_H6dEUU<(id}S6s7frU)Fnq$S2e3u-PJCmTxFJ3?y@5}9>}O{
z!f}vEWO_BrF_b+?kxe@ORM|;XQ;yxP9JbiaHVwLH(xRJoU<4Kw94$C(Vu_0ARyn9L
zm`dvw9dbFQQY|?kyE3+=Znb5|B~zB%vV%FPFn0smp&oY3)8KGIh(o4RL_3*82h%vM
zorrRqnUiuG?P{~FcDJ1XhxnsnNHlp4Aw|@{J@F1Gqj8{<v<JhHJa|a>gRD3hCfWHM
z?7*}CjQTfq>)yd>U<Ui!;~oE}^|xe~KIwLT6n8eRPk_Y_Su;;p7MB2=-(0)2JJN;e
zyE$AOy}xnzYya7FviIX)WAyUa>odzocb^}Baq?*S#P^*ikI&A%xiVQf{J8iNUp}v%
Td%Ji4TQqF0kJnzU-hA*IvG+&^