merge upstream

3 files changed, 30 insertions, 58 deletions

diff --git a/README.md b/README.md
index 010f6c7..848d4e3 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ by TenPlus1
 
 Depends: Farming Redo
 
-This mod adds a barrel used to ferment grapes into glasses of wine, 9 of which can then be crafted into a bottle of wine. It can also ferment honey into mead, barley into beer, wheat into weizen (wheat beer), and apples into cider.
+This mod adds a barrel used to ferment grapes into glasses of wine, 9 of which can then be crafted into a bottle of wine.  It can also ferment honey into mead, barley into beer, wheat into weizen (wheat beer), and apples into cider.
 
 Change log:
 
@@ -14,8 +14,9 @@ Change log:
 - 0.4 - Added ability to ferment barley from farming redo into beer and also honey from mobs redo into honey mead
 - 0.5 - Added apple cider
 - 0.6 - Added API so drinks can easily be added, also added wheat beer thanks to h-v-smacker and support for pipeworks/tubelib
+- 0.7 - Blue Agave now appears in desert areas and spreads very slowly, can me fermented into tequila
 
-Lucky Blocks: 8
+Lucky Blocks: 9
 
 
 Wine Mod API
@@ -28,4 +29,4 @@ e.g.
 wine:add_item({
 	{"farming:barley", "wine:glass_beer"},
 	{"default:apple", "wine:glass_cider"},
-})
+})
\ No newline at end of file
diff --git a/depends.txt b/depends.txt
index ce407db..a9ae3a1 100644
--- a/depends.txt
+++ b/depends.txt
@@ -2,4 +2,4 @@ default
 intllib?
 lucky_block?
 pipeworks?
-bonemeal?
\ No newline at end of file
+bonemeal?
diff --git a/init.lua b/init.lua
index 9e22aba..5f1aced 100644
--- a/init.lua
+++ b/init.lua
@@ -136,27 +136,6 @@ minetest.register_node("wine:glass_beer", {
 	on_use = minetest.item_eat(2),
 })
 
--- glass of weizen, or wheat beer
--- The image is a lighter version of the one from RiverKpocc @ deviantart.com
-minetest.register_node("wine:glass_wheat_beer", {
-	description = S("Wheat Beer"),
-	drawtype = "torchlike", --"plantlike",
-	visual_scale = 0.8,
-	tiles = {"wine_wheat_beer_glass.png"},
-	inventory_image = "wine_wheat_beer_glass.png",
-	wield_image = "wine_wheat_beer_glass.png",
-	paramtype = "light",
-	is_ground_content = false,
-	sunlight_propagates = true,
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}
-	},
-	groups = {vessel = 1, dig_immediate = 3, attached_node = 1},
-	sounds = default.node_sound_glass_defaults(),
-	on_use = minetest.item_eat(2),
-})
 
 -- glass of honey mead
 minetest.register_node("wine:glass_mead", {
@@ -269,7 +248,7 @@ minetest.register_node("wine:blue_agave", {
 		type = "fixed",
 		fixed = {-0.2, -0.5, -0.2, 0.2, 0.3, 0.2}
 	},
-	groups = {dig_immediate = 3, attached_node = 1, plant = 1},
+	groups = {snappy = 3, attached_node = 1, plant = 1},
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -283,7 +262,7 @@ minetest.register_decoration({
 	deco_type = "simple",
 	place_on = {"default:desert_sand"},
 	sidelen = 16,
-	fill_ratio = 0.005,
+	fill_ratio = 0.001,
 	biomes = {"desert"},
 	decoration = {"wine:blue_agave"},
 })
@@ -294,35 +273,32 @@ minetest.register_abm({
 	interval = 17,
 	chance = 33,
 	action = function(pos, node)
-		local n = minetest.find_nodes_in_area({x = pos.x-2, y = pos.y-1, z = pos.z-2},
-                                                  {x = pos.x+2, y = pos.y+1, z = pos.z+2},
-                                                  {"wine:blue_agave"})
-                      
+
+		local n = minetest.find_nodes_in_area(
+			{x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
+			{x = pos.x + 2, y = pos.y + 1, z = pos.z + 2},
+			{"wine:blue_agave"})
+
 		if #n > 3 then
 			-- needs to have 2 neighbors or less to propagate (3 = +itself)
 			return
 		end
-                      
-		local random = {
-			x = pos.x + math.random(-1, 1),
-			y = pos.y + math.random(-1, 1),
-			z = pos.z + math.random(-1, 1)
-		}
-		local random_node = minetest.get_node_or_nil(random)
-		if not random_node or random_node.name ~= "air" then
-			return
-		end
-		local node_under = minetest.get_node_or_nil({x = random.x,
-                                                         y = random.y - 1, 
-                                                         z = random.z})
-		if not node_under then
-			return
-		end
 
-		if node_under.name == "default:desert_sand" then
-			minetest.set_node(random, {name = "wine:blue_agave"})
+		-- find desert sand with air above
+		n = minetest.find_nodes_in_area_under_air(
+			{x = pos.x - 1, y = pos.y - 1, z = pos.z - 1},
+			{x = pos.x + 1, y = pos.y + 1, z = pos.z + 1},
+			{"default:desert_sand"})
+
+		-- place blue agave
+		if n and #n > 0 then
+
+			local new_pos = n[math.random(#n)]
+
+			new_pos.y = new_pos.y + 1
+
+			minetest.set_node(new_pos, {name = "wine:blue_agave"})
 		end
-                      
 	end
 })
 
@@ -351,13 +327,12 @@ minetest.register_node("wine:wine_barrel", {
 	mesh = "wine_barrel.obj",
 	paramtype = "light",
 	paramtype2 = "facedir",
-
 	groups = {
 		choppy = 2, oddly_breakable_by_hand = 1, flammable = 2,
 		tubedevice = 1, tubedevice_receiver = 1
 	},
 	legacy_facedir_simple = true,
--- 	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node,
 
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@@ -474,7 +449,6 @@ minetest.register_abm({
 			return
 		end
 
-
 		-- does it contain any of the source items on the list?
 		local has_item
 		for n = 1, #ferment do
@@ -489,19 +463,16 @@ minetest.register_abm({
 
 		-- is there room for additional fermentation?
 		if not inv:room_for_item("dst", ferment[has_item][2]) then
-
 			meta:set_string("infotext", S("Fermenting Barrel (FULL)"))
 			return
 		end
 
 		local status = meta:get_float("status")
 
-
 		-- fermenting (change status)
 		if status < 100 then
 			meta:set_string("infotext", S("Fermenting Barrel (@1% Done)", status))
 			meta:set_float("status", status + 5)
-
 		else
 			inv:remove_item("src", ferment[has_item][1])
 			inv:add_item("dst", ferment[has_item][2])
@@ -522,7 +493,7 @@ if minetest.get_modpath("lucky_block") then
 lucky_block:add_blocks({
 	{"dro", {"wine:glass_wine"}, 5},
 	{"dro", {"wine:glass_beer"}, 5},
-	{"dro", {"wine:glass_weizen_beer"}, 5},
+	{"dro", {"wine:glass_wheat_beer"}, 5},
 	{"dro", {"wine:glass_mead"}, 5},
 	{"dro", {"wine:glass_cider"}, 5},
 	{"dro", {"wine:glass_tequila"}, 5},
@@ -535,4 +506,4 @@ lucky_block:add_blocks({
 })
 end
 
-print (S("[MOD] Wine loaded"))
+print (S("[MOD] Wine loaded"))
\ No newline at end of file