fix mineclone compatibility and some new drinks by Sirrobzeroone

README.md

@@ -30,7 +30,7 @@ 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.
+- 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
 
 Lucky Blocks: 18
 

drinks.lua

@@ -1,4 +1,5 @@
 -- add all drinks even if mods to brew them aren't active
+-- (name, desc, has bottle, hunger, thirst, alcoholic)
 wine:add_drink("wine", "Wine", true, 2, 5, 1)
 wine:add_drink("beer", "Beer", true, 2, 8, 1)
 wine:add_drink("rum", "Rum", true, 2, 5, 1)
@@ -14,7 +15,10 @@ 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("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)
+wine:add_drink("sparkling_carrot_juice", "Sparkling Carrot Juice", 3, 4, 0)
+wine:add_drink("sparkling_blackberry_juice", "Sparkling Blackberry Juice", 2, 4, 0)
 
 -- brandy recipe
 minetest.register_craft({
@@ -45,7 +49,13 @@ minetest.override_item("wine:glass_brandy", {
 
 
 -- wine mod adds tequila by default
-wine:add_item({ {"wine:blue_agave", "wine:glass_tequila"} })
+wine:add_item({
+	{
+		{"wine:agave_syrup", "wine:blue_agave", "vessels:drinking_glass"},
+		"wine:glass_sparkling_agave_juice"
+	},
+	{"wine:blue_agave", "wine:glass_tequila"}
+})
 
 -- default game
 if minetest.get_modpath("default") then
@@ -94,8 +104,20 @@ if minetest.get_modpath("farming") then
 			{"farming:rice", "wine:glass_sake"},
 			{"farming:corn", "wine:glass_bourbon"},
 			{"farming:baked_potato", "wine:glass_vodka"},
-			{"farming:coffee_beans", "wine:glass_coffee_liquor"},
-			{{"wine:glass_wine", "farming:sugar"}, "wine:glass_champagne"}
+			{{"wine:glass_rum", "farming:coffee_beans"}, "wine:glass_coffee_liquor"},
+			{{"wine:glass_wine", "farming:sugar"}, "wine:glass_champagne"},
+			{
+				{"default:apple", "farming:sugar", "vessels:drinking_glass"},
+				"wine:glass_sparkling_apple_juice"
+			},
+			{
+				{"farming:carrot", "farming:sugar", "vessels:drinking_glass"},
+				"wine:glass_sparkling_carrot_juice"
+			},
+			{
+				{"farming:blackberry 2", "farming:sugar", "vessels:drinking_glass"},
+				"wine:glass_sparkling_blackberry_juice"
+			}
 		})
 	end
 end
@@ -106,7 +128,15 @@ if minetest.get_modpath("mcl_core") then
 	wine:add_item({
 		{"mcl_core:apple", "wine:glass_cider"},
 		{"mcl_core:reeds", "wine:glass_rum"},
-		{"mcl_core:wheat_item", "wine:glass_wheat_beer"},
-		{"mcl_core:potato_item_baked", "wine:glass_vodka"}
+		{"mcl_farming:wheat_item", "wine:glass_wheat_beer"},
+		{"mcl_farming:potato_item_baked", "wine:glass_vodka"},
+		{
+			{"mcl_core:apple", "mcl_core:sugar", "vessels:drinking_glass"},
+			"wine:glass_sparkling_apple_juice"
+		},
+		{
+			{"mcl_farming:carrot_item", "mcl_core:sugar", "vessels:drinking_glass"},
+			"wine:glass_sparkling_carrot_juice"
+		},
 	})
 end

init.lua

@@ -173,23 +173,35 @@ end
 -- Wine barrel formspec
 local function winebarrel_formspec(item_percent, brewing, water_percent)
 
-	return "size[8,9]"
+	local mcl_bg = mcl and "listcolors[#9d9d9d;#FFF7;#474747]" or ""
+
+	return "size[8,9]" .. mcl_bg
+
+	-- images
 	.. "image[0,0;7,5;wine_barrel_fs_bg.png]"
+	.. "image[5.88,1.8;1,1;wine_barrel_icon_bg.png^[lowpart:"
+	.. item_percent .. ":wine_barrel_icon.png]"
+	.. "image[1.04,2.7;4.45,1.65;wine_barrel_water.png"
+	.. "^[colorize:#261c0e:175^[opacity:125"
+	.. "^[lowpart:" .. water_percent .. ":wine_barrel_water.png]"
+
+	-- inside barrel tinv
 	.. "list[current_name;src;1.9,0.7;2,2;]"
+	.. "list[current_name;src_b;2.4,2.95;1,1;0]"
+
+	-- outside barrel inv
 	.. "list[current_name;dst;7,1.8;1,1;]"
 	.. "list[current_player;main;0,5;8,4;]"
+
+	-- tooltips
+	.. "tooltip[5.88,1.8;1,1;" .. brewing .. "]"
+	.. "tooltip[1.05,2.7;3.495,1.45;" .. S("Water @1% Full", water_percent) .. "]"
+
+	-- shift-click
 	.. "listring[current_name;dst]"
 	.. "listring[current_player;main]"
 	.. "listring[current_name;src]"
 	.. "listring[current_player;main]"
-	.. "image[5.88,1.8;1,1;wine_barrel_icon_bg.png^[lowpart:"
-	.. item_percent .. ":wine_barrel_icon.png]"
-	.. "tooltip[5.88,1.8;1,1;" .. brewing .. "]"
-	.. "image[1.04,2.7;4.45,1.65;wine_barrel_water.png"
-	.. "^[colorize:#261c0e:175^[opacity:125"
-	.. "^[lowpart:" .. water_percent .. ":wine_barrel_water.png]"
-	.. "list[current_name;src_b;2.4,2.95;1,1;0]"
-	.. "tooltip[1.05,2.7;3.495,1.45;" .. S("Water @1% Full", water_percent) .. "]"
 end
 
 
@@ -213,7 +225,7 @@ minetest.register_node("wine:wine_barrel", {
 	paramtype2 = "facedir",
 	groups = {
 		choppy = 2, oddly_breakable_by_hand = 1, flammable = 2,
-		tubedevice = 1, tubedevice_receiver = 1
+		tubedevice = 1, tubedevice_receiver = 1, axey = 1
 	},
 	legacy_facedir_simple = true,
 

license.txt

@@ -53,4 +53,12 @@ Textures by Sirrobzeroone (CC-by-3.0)
   wine_kefir_bottle.png
   wine_drinking_glass.png
   wine_barrel_water.png
+  wine_sparkling_agave_juice_glass.png
+  wine_sparkling_agave_juice_bottle.png
+  wine_sparkling_apple_juice_glass.png
+  wine_sparkling_apple_juice_bottle.png
+  wine_sparkling_blackberry_juice_glass.png
+  wine_sparkling_blackberry_juice_bottle.png
+  wine_sparkling_carrot_juice_glass.png
+  wine_sparkling_carrot_juice_bottle.png
   screenshot.png