From fc1d05978e229cb9858aa14d5786a8049a892107 Mon Sep 17 00:00:00 2001
From: wsor4035 <24964441+wsor4035@users.noreply.github.com>
Date: Fri, 27 Oct 2023 03:29:04 -0400
Subject: [PATCH] Remove biome lib from pl_waterlilies (#65)

* remove biome lib from pl_waterlilies

* Add rarity setting

---------

Co-authored-by: Niklp09 <89982526+Niklp09@users.noreply.github.com>
---
 pl_waterlilies/init.lua         | 90 +++++++++++++++++++--------------
 pl_waterlilies/mod.conf         |  1 -
 pl_waterlilies/settingtypes.txt |  7 +--
 3 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/pl_waterlilies/init.lua b/pl_waterlilies/init.lua
index 491a39a..430dcc5 100644
--- a/pl_waterlilies/init.lua
+++ b/pl_waterlilies/init.lua
@@ -1,10 +1,7 @@
 -- support for i18n
 local S = minetest.get_translator("pl_waterlilies")
 
-pl_waterlilies = {}
-
-local lilies_max_count = tonumber(minetest.settings:get("pl_waterlilies_max_count")) or 320
-local lilies_rarity = tonumber(minetest.settings:get("pl_waterlilies_rarity")) or 33
+local fill_ratio = minetest.settings:get("pl_waterlilies.waterlily_rarity") or 0.03
 
 local function get_ndef(name)
 	return minetest.registered_nodes[name] or {}
@@ -21,6 +18,15 @@ local lilies_list = {
 	{ "s4" , "small_4" , 8	},
 }
 
+local lilynames_list = {}
+for i in ipairs(lilies_list) do
+	local deg1 = ""
+	if lilies_list[i][1] ~= nil then
+		deg1 = "_"..lilies_list[i][1]
+	end
+	table.insert(lilynames_list, "flowers:waterlily"..deg1)
+end
+
 for i in ipairs(lilies_list) do
 	local deg1 = ""
 	local deg2 = ""
@@ -124,42 +130,50 @@ for i in ipairs(lilies_list) do
 			end
 		end,
 	})
+
+	minetest.register_decoration({
+		name = "flowers:waterlily"..deg1,
+		decoration = {"flowers:waterlily"..deg1},
+		place_on = {"default:water_source"},
+		deco_type = "simple",
+		flags = "liquid_surface",
+		spawn_by = "default:sand",
+		num_spawn_by = 1,
+		fill_ratio = fill_ratio,
+		check_offset = -1,
+		y_min = 1,
+		y_max = 1,
+	})
+
+	minetest.register_decoration({
+		name = "flowers:waterlily"..deg1 .."_relative",
+		decoration = {"flowers:waterlily"..deg1},
+		place_on = {"default:water_source"},
+		deco_type = "simple",
+		flags = "liquid_surface",
+		spawn_by = lilynames_list,
+		num_spawn_by = 1,
+		fill_ratio = fill_ratio*1.25,
+		check_offset = -1,
+		y_min = 1,
+		y_max = 1,
+	})
+
+	minetest.register_decoration({
+		name = "flowers:waterlily"..deg1 .."_relative",
+		decoration = {"flowers:waterlily"..deg1},
+		place_on = {"default:water_source"},
+		deco_type = "simple",
+		flags = "liquid_surface",
+		spawn_by = lilynames_list,
+		num_spawn_by = 1,
+		fill_ratio = fill_ratio*1.5,
+		check_offset = -1,
+		y_min = 1,
+		y_max = 1,
+	})
 end
 
-pl_waterlilies.grow_waterlily = function(pos)
-	local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
-	for i in ipairs(lilies_list) do
-		local chance = math.random(1,8)
-		local ext = ""
-		local num = lilies_list[i][3]
-
-		if lilies_list[i][1] ~= nil then
-			ext = "_"..lilies_list[i][1]
-		end
-
-		if chance == num then
-			minetest.swap_node(right_here, {name="flowers:waterlily"..ext, param2=math.random(0,3)})
-		end
-	end
-end
-
-biome_lib.register_on_generate({
-		surface = {"default:water_source"},
-		max_count = lilies_max_count,
-		rarity = lilies_rarity,
-		min_elevation = 1,
-		max_elevation = 40,
-		near_nodes = {"default:dirt_with_grass"},
-		near_nodes_size = 4,
-		near_nodes_vertical = 1,
-		near_nodes_count = 1,
-		plantlife_limit = -0.9,
-		temp_max = -0.22,
-		temp_min = 0.22,
-	},
-	pl_waterlilies.grow_waterlily
-)
-
 minetest.register_alias( "flowers:flower_waterlily", "flowers:waterlily")
 minetest.register_alias( "flowers:flower_waterlily_225", "flowers:waterlily_225")
 minetest.register_alias( "flowers:flower_waterlily_45", "flowers:waterlily_45")
diff --git a/pl_waterlilies/mod.conf b/pl_waterlilies/mod.conf
index 5233adb..3e96eb3 100644
--- a/pl_waterlilies/mod.conf
+++ b/pl_waterlilies/mod.conf
@@ -1,3 +1,2 @@
 name = pl_waterlilies
-depends = biome_lib
 optional_depends = farming, flowers
diff --git a/pl_waterlilies/settingtypes.txt b/pl_waterlilies/settingtypes.txt
index 523a677..c0e1062 100644
--- a/pl_waterlilies/settingtypes.txt
+++ b/pl_waterlilies/settingtypes.txt
@@ -1,5 +1,2 @@
-#Water-lilies maximum count
-pl_waterlilies_max_count (Water-lilies maximum count) int 320 1 1000
-
-#Water-lilies rarity
-pl_waterlilies_rarity (Water-lilies rarity) int 33 0 100
+# Waterlily rarity (higher number -> higher probability)
+pl_waterlilies.waterlily_rarity (Waterlily rarity) float 0.03 0.0001 1