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=#;4v=Ci3GxdD(m;^6jC~@IGWK+F45?sDR^SPXtuU(o-uh3p
z`hx4joE<VwBC&iKOtV~`@6qL`^x<3~vrNN@PlH9AmBHtoLc$H#SppzqJYD@<);T3K
F0RSR>9@hW>

delta 926
zcmb<h#Xdo@o|%Dx;qyhmoeT`j3;{kNu0ZapRjV#vzTDN-_5c6>*}E@v&fC(zV$Z4z
zPk?M7<J^hePaoadx@zt;A)U)w7TFw1Km{Rz{-wF;CyyVT+}H7|$K&@#r@vR#|9z|Y
z8EbY#SKHpsT31JV_UzemvNB)4em!>V*qP1K9-UwH{nd&3Bi=46%=O!KRqeO-YxNZ<
zq<Pn*$J&}0l&UH4xSP!DtV~u{G)!#qY+9AP;+(o)DbP(<uU_4}dGn-6lgi7>t*or9
zt*vcrY;0|9?d<IA?d=^L92^}Tot&JUot<4=TwGmU-Q3*V-Q7JrJUl%;y}Z1<y}f;W
ze0+U<{rvp=>;3%$0s;a91A~Hsf`fxYLPA1AL&L(t!o$NOA|fIqBcr0CqNAf@Vq#)r
zW8>oD;^X5J5)u*<6O)pXl9Q8DQc_Y=Q`6GY($mv3GBPqVGqbX?va_>ua&mHWbMx}@
z^7Hcx3JMAf3yX@1ii?X&N=iygOUug2fKIQdsHm*0udJ%7s;;iCsi~>0t*xu8tFNzb
zXlQ6`Y;0<3YHn_BX=!O~ZEb67Yj1Dw=;-L|>;%S3cXxMBPfu@eZ(m<ue}Dgk2@@tx
zoCpk$$&)8fnKEVS)Tz^^O`AS_`ivPfX3m^BYt}4a$j_NGXYSm&^XAQ)KY#v$1q&7~
zT)1e_qQ#3B*DqPJWa-kS%a$!$zI^$L6)RS*TnUW+)vH&pS+i#C+O_M}ty{l-{e}%2
zHg4RwY11ZPuy5J2W$V_h+qP}nzJ2?S9XodJ+_`JluHCzL@7c3w@7}%p_U+rhfB%64
z2M!)Qc<9if!-o$aIdbIa(WAg9KYsl9i4!MIo;-Q#)Tz^_PoFt+=Iq(C=jzX$JAeNC
zg$oxhUc7ke(j{QJyK?0UFoLgLyLSEh^&2;C+`M`7)~#E&Z{NOi=g!@`ckkW1cmMwV
z2M-=ReE9IuqeqV)KYsG$$<wD#pFMl_{Q2`2FJ8QS`SR7PSFc~ce)Hzd+qZAuy?gim
z{re9eK79Q6@zbYIpFe;8^5qLK4SxIf?fdudKYrBz`1$kauV24@|Ni~w&!4}4|Ni^;
z517P`-LhW_%n7C?L4LsuKt2O7PJtA002pZN_>`Dt01Z&_ba4!+n3J5~z$7y#MnI}#
t=K_-%M>*3toLmm_7<daPN$7JdVHAGIuqR{QfxSQt44$rjF6*2UngBEC8KD3G

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!ia0vp^AT}2V8<6ZZI=>f4u_bxCyD+FT1Tr*mrSzWxif|Tq
zL>4nJa0`PlBg3pY5<o%r5>H=O_9q;|JX{9PJ|-Rm3K@F3IEF}EPEL@pd2nW?@x%0U
zb2#0_(_Mn6oH}qof%mDMsiEOa-pR>}j=Tz4ak80}fx&vZ0FV2RE;pcN22WQ%mvv4F
FO#sV`EYko0

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!ia0vp^oIuRQ#0(^*v*+l71Oj|QT!Hk=nKRFvIdh`M<|mND
zSQ6wH%;50sMjDW#=jq}YQo)#<5Pj%?!hsV9E|?r_T-dy{ap7Usj&Ku$9R?N#7He5f
g85$TA_$DwgtkL1n&)s`%Do`hbr>mdKI;Vst0FE;$O8@`>

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_potions/lingering.lua b/mods/ITEMS/mcl_potions/lingering.lua
index c74143233e..cb327accc4 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 2f7fbf77f2..fb47ebd8a0 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!ia0vp^AT}2V8<6ZZI=>f4$#}XrhEy;nOSn8ZGt-z?!6!h_
iXqkuNva8MP3=HSXl{RueN<0Tt$KdJe=d#Wzp$P!<;}w7a

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#ziU)c5QR?&!fr5YV`Z=p1Z@Vf5;P>3h=iCQg<xUh6jtJ<l7JvKLJAQqrW0dr
zAy@_!1resO6-z5iV`(vd^Zo)W3opF4%-(y?eCN!2vbk|}e(ubir1|x=l`Ve9JaeO2
z-Z#EIK9FX$d3|S<QZmV<kW#9y%w#SLS<0$6-Q+G0dCIHLhACVTid0lzO;frul&LI~
zRHkxOs8U6NHqvNunbXyMdbwGcrCD`bDtGfRPxERDHp4B#A}y++IGb)6mT6fqa@ESM
z!YZxk3N>OtLkSjpG)5a~w76VtsB2cZr+c+O+EPV$q(`+~DA>&KOwYnSP@MG&uk^wm
zd4S1n;=n%;ID{H8prPa_95hB7X|$@7>uqXQMpOrhKiX1dMi#kZ7Ya6`GKw5YngHP9
zI6>o<D9Hm%ZW9Mg7{(#ghyl$_u;8FE+DKQAs86#^%_=5Fkoco5RaW%?hw(SXFwvgp
zFr<bWa_{jDQ8wd{PEUI<+{lB69{zyU4u(!h^Eogj!o$<hYWNcW`RmSu{j<`H_O>>*
z!T2xN--f#IIqq_Hd~faMRGNJ3XXg3RWPv{~uCH9#8O5c8_hVfieYkb>d+)`;bob}}
z+UV7ZH|G|Q@4q~Gc=~wp)Q|0FPtT9vUYjl*eVY8z*DuQ#-t9j8-VE!j8!NAuZ$J72
DvG+&^