From 7d1ff139b9edadc53c4c1a1f9d71498f05f69e7b Mon Sep 17 00:00:00 2001
From: Rui914 <mrrst0914@gmail.com>
Date: Tue, 21 Jul 2015 18:17:24 +0900
Subject: [PATCH] Better bucket textures(Overlay support)

A
---
 mods/bucket/init.lua                        |  17 +++++++++++------
 mods/bucket/textures/bucket.png             | Bin 163 -> 205 bytes
 mods/bucket/textures/bucket_lava.png        | Bin 167 -> 0 bytes
 mods/bucket/textures/bucket_overlay.png     | Bin 0 -> 189 bytes
 mods/bucket/textures/bucket_river_water.png | Bin 316 -> 0 bytes
 mods/bucket/textures/bucket_water.png       | Bin 169 -> 0 bytes
 6 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 mods/bucket/textures/bucket_lava.png
 create mode 100644 mods/bucket/textures/bucket_overlay.png
 delete mode 100644 mods/bucket/textures/bucket_river_water.png
 delete mode 100644 mods/bucket/textures/bucket_water.png

diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua
index 89730de7..d7e346c9 100644
--- a/mods/bucket/init.lua
+++ b/mods/bucket/init.lua
@@ -46,6 +46,10 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 	bucket.liquids[flowing] = bucket.liquids[source]
 
 	if itemname ~= nil then
+		if groups and groups.overlay_texture then
+			inventory_image = "bucket_overlay.png^"..inventory_image.."^[noalpha^bucket_overlay.png^[makealpha:255,126,126"
+			groups.overlay_texture = nil
+		end
 		minetest.register_craftitem(itemname, {
 			description = name,
 			inventory_image = inventory_image,
@@ -161,26 +165,27 @@ bucket.register_liquid(
 	"default:water_source",
 	"default:water_flowing",
 	"bucket:bucket_water",
-	"bucket_water.png",
+	"default_water.png",
 	"Water Bucket",
-	{water_bucket = 1}
+	{water_bucket = 1, overlay_texture = 1}
 )
 
 bucket.register_liquid(
 	"default:river_water_source",
 	"default:river_water_flowing",
 	"bucket:bucket_river_water",
-	"bucket_river_water.png",
+	"default_river_water.png",
 	"River Water Bucket",
-	{water_bucket = 1}
+	{water_bucket = 1, overlay_texture = 1}
 )
 
 bucket.register_liquid(
 	"default:lava_source",
 	"default:lava_flowing",
 	"bucket:bucket_lava",
-	"bucket_lava.png",
-	"Lava Bucket"
+	"default_lava.png",
+	"Lava Bucket",
+	{overlay_texture = 1}
 )
 
 minetest.register_craft({
diff --git a/mods/bucket/textures/bucket.png b/mods/bucket/textures/bucket.png
index 6779528753716365ba2d722b3587280e82d3a0e0..17b0c4933e22c427c3317c8731be7e82bed88c42 100644
GIT binary patch
delta 188
zcmZ3?c$RU3WIZzj1A~Sxe=v~J3h)VW1=0!%3XYDBUS3{7K|wJwF^P$ZX=!Qs`T0#v
zO%o<em_L91vSrJ5?b>B9ZSw)3YQ~ZvzhDN3XE)M-oIp<($B>F!z5R}S2NXD1R(B+I
z|Noz7KB;%v#|t~pGO(|kzvSeyw6!x09YehXT_5f9Fg>TV$Ln3@CGEonAMP9%NY#0M
o%KU)xh6K5D4TbA@ZtJ_pRc0`Y%-CKm1~i?))78&qol`;+01`e)@c;k-

delta 146
zcmV;D0B!%x0iyws8Gi-<001BJ|6u?C0BT7@K~#7F&63dx03i%RZ#7qN11E5YF48@^
zT#x)n;FR?K47|@gBlNj8d8SyLb23`O#oqfC7RlMIwGV1Vy8B}He>2N5h89Ew%TNST
zfGk11tXKRKfYbc)EuhF$U*{DlF#7e<DPNfvlAqIld{L#C01E&B07*qoM6N<$f@?fK
AJ^%m!

diff --git a/mods/bucket/textures/bucket_lava.png b/mods/bucket/textures/bucket_lava.png
deleted file mode 100644
index d2baeb9ba5e6c805d7924735ac0325ffd999beb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`d7dtgAr*{gCvD_qRpdGPkEedd
z?e@@&Jf3d}JLlYS@fWGo>`V!~x#YzATb)hwB;Ln=oG3DXmX?s0SI&e@oNKl|;8|+(
zyvMMO|IOY?VWty$2j(!UFu9pUD{N<$3Y5IHy<tU3{dHXdk<Zotr|8e&=hnSZV=ufq
Q6KFGor>mdKI;Vst04*3iwEzGB

diff --git a/mods/bucket/textures/bucket_overlay.png b/mods/bucket/textures/bucket_overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..0beb98fbee043ce13844165d7d6f2617bf830d8e
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a^~o$$P*C_^SGR20vc$y1
zrlzI|6DG``KY!P*U5)>e3xUcQOM?7@862M7NCR>LJY5_^D&mp@nwV1B7A;sH(6LbC
zz<~oAEGZ0`3fw0ISUNeFBoDPU@hs|7aNE4mQH#rY<INp9E*wWTG#K`rRpe29XtY2`
jz}d$1h~QB@4F-m%TEdeaRGKCN&1Ud)^>bP0l+XkK4J|(b

literal 0
HcmV?d00001

diff --git a/mods/bucket/textures/bucket_river_water.png b/mods/bucket/textures/bucket_river_water.png
deleted file mode 100644
index 1d9e62a79eeb0f848d8fddde4760bee10cd3d623..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP~8!NK~>!*p|p8|zWdb&7<Se!mPX)ott1A*50KHChu
z*4plI@la=ybcqc!XvsEic1$hvQ11{-X&0I9Cbmgc(z)x2*5AG5_viBcDD609nSZro
z)`ybKo4a2x)P8j&Xie4bu0Iy##%ot3PVW&a+*qTgq^87|#?ug*ANh3};|9aFt=HzL
z-JWXDp4jl+?#;X%d%hbS6Y<UpQdwL2EkWk^j<R!&9ce#&PhPF=-<HeB5acBj|2-?%
zxVbY)OHq~MW;pMrb6%Rt|E4*1-QW4feNt?V@hPTyae13gPiKQ8kKO`3#o+1c=d#Wz
Gp$P!BVR+2|

diff --git a/mods/bucket/textures/bucket_water.png b/mods/bucket/textures/bucket_water.png
deleted file mode 100644
index 877692a253156109ed418bea13dc8a4929d50265..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`1)eUBAr*{gCmrN$Fc4tTJudY|
z?Z@^GlSy_=D|L<JBUSF)GiGnDODpQP-Zocqg7Euv4K<}tmAw-*j6{{!Gp{v`X#25#
z>$#vV{xA1_)(JS2F+P)bP)bPI%vxl%KyadBJ$HxGuhP3rj-Gqp`B$E<WUStIt@?4<
Rzh0o-44$rjF6*2UngDUyJjwt7