From 83e1557a342180deddd966f1b70dbe3eda05df0e Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Mon, 29 Aug 2022 15:52:04 +0100
Subject: [PATCH] added cointreau and margarita (thanks Ethace10 for idea)

---
 README.md                          |   4 ++--
 drinks.lua                         |  16 ++++++++++++++++
 lucky_block.lua                    |   6 +++++-
 textures/wine_cointreau_bottle.png | Bin 0 -> 300 bytes
 textures/wine_cointreau_glass.png  | Bin 0 -> 165 bytes
 textures/wine_margarita_glass.png  | Bin 0 -> 182 bytes
 6 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 textures/wine_cointreau_bottle.png
 create mode 100644 textures/wine_cointreau_glass.png
 create mode 100644 textures/wine_margarita_glass.png

diff --git a/README.md b/README.md
index 5b5b3f0..826f542 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,9 @@ re-arranged code, tweaked lucky blocks, updated translations
 - 1.9 - Added wine:add_drink() function to create drink glasses and bottles
 - 1.95 - Tweaked code to accept 2 item recipes, fixed mineclone2 rum recipe and ui recipes
 - 1.98 - New formspec textures and Kefir drink by Sirrobzeroone
-- 1.99 - Barrel now has 4 slots for recipe items (and drinking glasses) and a water slot to fill up barrel with water buckets ready for fermenting, fix mineclone2 compatibility, added translations
+- 1.99 - Barrel now has 4 slots for recipe items (and drinking glasses) and a water slot to fill up barrel with water buckets ready for fermenting, fix mineclone2 compatibility, added translations, added cointreau and margarita (thx Ethace10 for idea)
 
-Lucky Blocks: 22
+Lucky Blocks: 24
 
 
 Wine Mod API
diff --git a/drinks.lua b/drinks.lua
index 8010fa7..5d9fa6d 100644
--- a/drinks.lua
+++ b/drinks.lua
@@ -14,6 +14,8 @@ wine:add_drink("mint", "Mint Julep", true, 4, 3, 1)
 wine:add_drink("brandy", "Brandy", true, 3, 4, 1)
 wine:add_drink("coffee_liquor", "Coffee Liquor", true, 3, 4, 1)
 wine:add_drink("champagne", "Champagne", true, 4, 5, 1)
+wine:add_drink("cointreau", "Cointreau", true, 2, 3, 1)
+wine:add_drink("margarita", "Margarita", false, 4, 5, 1)
 wine:add_drink("kefir", "Kefir", true, 4, 4, 0)
 wine:add_drink("sparkling_agave_juice", "Sparkling Agave Juice", 2, 4, 0)
 wine:add_drink("sparkling_apple_juice", "Sparkling Apple Juice", 2, 5, 0)
@@ -121,6 +123,20 @@ if minetest.get_modpath("farming") then
 	end
 end
 
+-- ethereal
+if minetest.get_modpath("ethereal") then
+
+	wine:add_item({ {"ethereal:orange", "wine:glass_cointreau"} })
+
+	-- margarita recipe
+	minetest.register_craft({
+		output = "wine:glass_margarita 2",
+		recipe = {
+			{"wine:glass_cointreau", "wine:glass_tequila", "ethereal:lemon"}
+		}
+	})
+end
+
 -- mineclone2
 if minetest.get_modpath("mcl_core") then
 
diff --git a/lucky_block.lua b/lucky_block.lua
index 4ad8309..c37326a 100644
--- a/lucky_block.lua
+++ b/lucky_block.lua
@@ -14,6 +14,8 @@ lucky_block:add_blocks({
 	{"dro", {"wine:glass_coffee_liquor"}, 5},
 	{"dro", {"wine:glass_brandy"}, 5},
 	{"dro", {"wine:glass_champagne"}, 5},
+	{"dro", {"wine:glass_cointreau"}, 5},
+	{"dro", {"wine:glass_margarita"}, 5},
 	{"dro", {"wine:glass_sparkling_agave_juice"}, 5},
 	{"dro", {"wine:glass_sparkling_apple_juice"}, 5},
 	{"dro", {"wine:glass_sparkling_carrot_juice"}, 5},
@@ -36,9 +38,11 @@ lucky_block:add_blocks({
 		{name = "wine:bottle_coffee_liquor", max = 1},
 		{name = "wine:bottle_brandy", max = 1},
 		{name = "wine:bottle_champagne", max = 1},
+		{name = "wine:bottle_cointreau", max = 1},
 		{name = "wine:bottle_sparkling_agave_juice", max = 1},
 		{name = "wine:bottle_sparkling_apple_juice", max = 1},
 		{name = "wine:bottle_sparkling_carrot_juice", max = 1},
 		{name = "wine:bottle_sparkling_blackberry_juice", max = 1},
-		{name = "wine:blue_agave", max = 4}}},
+		{name = "wine:blue_agave", max = 4}
+	}}
 })
diff --git a/textures/wine_cointreau_bottle.png b/textures/wine_cointreau_bottle.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6cc2c0027382ab2015adba063f5a8f5354858ed
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s3?yAI>n{URegQrquKjlPF&rGJTwKwTV(BuH
z>GJZ0a?+JDk`vAN7FsYA`gr}TlKEE+M6!Qtr2p2){HvAzSEux=P3mu_<i9S-f4$}}
zH!!^1$o204!{0LnoxDs6K$96ug8YIR9G=}s19EyiT^vI+&d<GgP^ejfhb2HutT$}!
zMS&mx<#k_Je4Fs(LEL>Eo;Ahw9~F80y5IBUG<UA;JLr_Z$oySS5EJu5NwWau%c21W
zS9_S4LT-M)!u=yD?MUjp`$~Bc0;xxGW0!LV9`o1iTk@b>bGeeXuhOYC3PI<zK1u%6
uobxqp%PhlJ9N|a$?bTM^j;OwOR(>-xH{)N$C;UKnF?hQAxvX<aXaWFob#jLQ

literal 0
HcmV?d00001

diff --git a/textures/wine_cointreau_glass.png b/textures/wine_cointreau_glass.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b695f6720b895956ec85aa6ca49c443d0c647bf
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ%`eIYGXMSi_kV`sfv^Am
z=O}KzcKc1Pek@Rwu_VYZn8D%MjWi&~&eO#)gyVX0LIbm!sse-Yf*FmDHzRH`o+;qv
zY&D2*I;^lNvd4G9uS-G+Yz6`;8+Pn)kl;*UVadtV<MCi%c<`Am>dvY)%YY^^c)I$z
JtaD0e0sxH3Htqlb

literal 0
HcmV?d00001

diff --git a/textures/wine_margarita_glass.png b/textures/wine_margarita_glass.png
new file mode 100644
index 0000000000000000000000000000000000000000..efebb3fb14455b1a5d8e8bb7ab5a1e571acc838e
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=8mZq&~P%wfWlZzt7A6
zKCk`zyzao)e}7-k{`c?SOy0CYpbEy4AirP+hi5m^fE+hZ7sn8e>&XcWjAHC;90i4p
zLdJ~=Zd?-#JvliXc>GkCdag<^efsJVYr@nwO^<k1@USH_Ycx-8G-#G}n?BuH;^?ub
b4wD(*wsSXC<RnA^O=R$N^>bP0l+XkKaz8;`

literal 0
HcmV?d00001