Generate papyrus at water_height

README.md

@@ -2,7 +2,7 @@ The RealTest Game
 (Minetest 5 Edition)
 ====================
 
-Version 1.2.0
+Version 1.2.2
 
 RealTest is an open-ended sandbox building game with a focus on realism, especially with ores. There are many different ores, and getting new tools is generally much more complex than in similar games. Eventually, you will be able to build a nice little home. There are no monsters.
 

mods/awards/mod.conf

@@ -1,9 +1,3 @@
 name = awards
-title = Awards
-author = rubenwardy
 description = Adds awards to Minetest, and an API to register new ones.
 optional_depends = sfinv,unified_inventory,default,stairs,farming,dye,beds,wool,vessels,moreblocks,fire,flowers,nyancat
-license = MIT
-forum = https://forum.minetest.net/viewtopic.php?t=4870
-version = 3.0.0
-release = 638

mods/bushes_classic/cooking.lua

@@ -37,25 +37,12 @@ for i, berry in ipairs(bushes_classic.bushes) do
 
 	if berry ~= "mixed_berry" then
 
-		if berry == "strawberry" and minetest.registered_nodes["farming_plus:strawberry"] then
-			-- Special case for strawberries, when farming_plus is in use. Use
-			-- the item from that mod, but redefine it so it has the right
-			-- groups and does't look so ugly!
-			minetest.register_craftitem(":farming_plus:strawberry_item", {
-				description = S("Strawberry"),
-				inventory_image = "bushes_"..berry..".png",
-				on_use = minetest.item_eat(2),
-				groups = {berry=1, strawberry=1}
-			})
-			minetest.register_alias("bushes:strawberry", "farming_plus:strawberry_item")
-		else
-			minetest.register_craftitem(":bushes:"..berry, {
-				description = desc,
-				inventory_image = "bushes_"..berry..".png",
-				groups = {berry = 1, [berry] = 1},
-				on_use = minetest.item_eat(1),
-			})
-		end
+		minetest.register_craftitem(":bushes:"..berry, {
+			description = desc,
+			inventory_image = "bushes_"..berry..".png",
+			groups = {berry = 1, [berry] = 1},
+			on_use = minetest.item_eat(1),
+		})
 		minetest.register_craft({
 			output = "bushes:"..berry.."_pie_raw 1",
 			recipe = {

mods/bushes_classic/depends.txt

@@ -1,3 +1,2 @@
 plants_lib
 farming?
-farming_plus?

mods/default/mapgen.lua

@@ -129,6 +129,8 @@ function default.make_cactus(pos, size)
 	end
 end
 
+local water_level = tonumber(minetest.settings:get("water_level")) or 1
+
 minetest.register_on_generated(function(minp, maxp, seed)
 	if maxp.y >= 2 and minp.y <= 0 then
 		-- Generate papyrus
@@ -149,9 +151,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
 			for i=0,papyrus_amount do
 				local x = pr:next(x0, x1)
 				local z = pr:next(z0, z1)
-				if minetest.get_node({x=x,y=1,z=z}).name == "default:dirt_with_grass" and
-						minetest.find_node_near({x=x,y=1,z=z}, 1, "default:water_source") then
-					default.make_papyrus({x=x,y=2,z=z}, pr:next(2, 4))
+				if minetest.get_node({x=x,y=water_level,z=z}).name == "default:dirt_with_grass" and
+						minetest.find_node_near({x=x,y=water_level,z=z}, 1, "default:water_source") then
+					default.make_papyrus({x=x,y=water_level+1,z=z}, pr:next(2, 4))
 				end
 			end
 		end