Version MFF.

3dmushrooms/init.lua

@@ -5,17 +5,6 @@
 
 mushroom = {}
 
-minetest.override_item("flowers:mushroom_fertile_brown", {
-	drawtype = "mesh",
-	mesh = "3dmushrooms.obj",
-	tiles = {"3dmushrooms_brown.png"},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
-	},
-	inventory_image = "3dmushrooms_brown_inv.png"
-})
-
 minetest.override_item("flowers:mushroom_brown", {
 	drawtype = "mesh",
 	mesh = "3dmushrooms.obj",
@@ -27,17 +16,6 @@ minetest.override_item("flowers:mushroom_brown", {
 	inventory_image = "3dmushrooms_brown_inv.png"
 })
 
-minetest.override_item("flowers:mushroom_fertile_red", {
-	drawtype = "mesh",
-	mesh = "3dmushrooms.obj",
-	tiles = {"3dmushrooms_red.png"},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
-	},
-	inventory_image = "3dmushrooms_red_inv.png"
-})
-
 minetest.override_item("flowers:mushroom_red", {
 	drawtype = "mesh",
 	mesh = "3dmushrooms.obj",
@@ -52,17 +30,17 @@ minetest.override_item("flowers:mushroom_red", {
 -- aliases to the default mushrooms
 
 minetest.register_alias("mushroom:brown", "flowers:mushroom_brown")
-minetest.register_alias("mushroom:brown_natural", "flowers:mushroom_fertile_brown")
-minetest.register_alias("mushroom:spore_brown", "flowers:mushroom_spores_brown")
-minetest.register_alias("mushroom:spore2", "flowers:mushroom_spores_brown")
+minetest.register_alias("mushroom:brown_natural", "flowers:mushroom_brown")
+minetest.register_alias("mushroom:spore_brown", "flowers:mushroom_brown")
+minetest.register_alias("mushroom:spore2", "flowers:mushroom_brown")
 minetest.register_alias("mushroom:brown_essence", "flowers:mushroom_brown")
 
 minetest.register_alias("mushroom:red", "flowers:mushroom_red")
-minetest.register_alias("mushroom:red_natural", "flowers:mushroom_fertile_red")
-minetest.register_alias("mushroom:spore_red", "flowers:mushroom_spores_red")
-minetest.register_alias("mushroom:spore1", "flowers:mushroom_spores_red")
+minetest.register_alias("mushroom:red_natural", "flowers:mushroom_red")
+minetest.register_alias("mushroom:spore_red", "flowers:mushroom_red")
+minetest.register_alias("mushroom:spore1", "flowers:mushroom_red")
 minetest.register_alias("mushroom:poison", "flowers:mushroom_red")
 
 minetest.register_alias("mushroom:identifier", "default:mese_crystal_fragment")
 
-print("[3D Mushrooms] loaded.")
+minetest.log("action", "[3D Mushrooms] loaded.")

along_shore/init.lua

@@ -5,5 +5,5 @@ local mname		= "along_shore"
 -----------------------------------------------------------------------------------------------
 
 -----------------------------------------------------------------------------------------------
-print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...")
+minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...")
 -----------------------------------------------------------------------------------------------

bushes/init.lua

@@ -4,15 +4,15 @@
 -- bush leaf textures are cc-by-sa 3.0.  from VannessaE's moretrees mod.  (Leaf texture created by RealBadAngel or VanessaE)
 -- Branch textures created by Neuromancer.
 -- Licence for Code and Non-Bush leaf code is WTFPL.
- 
-  abstract_bushes = {} 
+
+  abstract_bushes = {}
 
   minetest.register_node("bushes:youngtree2_bottom", {
-	description = "Young Tree 2 (bottom)", 
+	description = "Young Tree 2 (bottom)",
  drawtype="nodebox",
  tiles = {"bushes_youngtree2trunk.png"},
  	inventory_image = "bushes_youngtree2trunk_inv.png",
-	wield_image = "bushes_youngtree2trunk_inv.png", 
+	wield_image = "bushes_youngtree2trunk_inv.png",
 paramtype = "light",
 	walkable = false,
 	is_ground_content = true,
@@ -27,7 +27,7 @@ node_box = {
 	sounds = default.node_sound_leaves_defaults(),
 	drop = 'default:stick'
 })
-  
+
   local BushBranchCenter 			= { {1,1}, {3,2} }
 for i in pairs(BushBranchCenter) do
 	local Num 		= BushBranchCenter[i][1]
@@ -56,8 +56,8 @@ for i in pairs(BushBranchCenter) do
 				sunlight_propagates = true,
 		groups = {
 		--	tree=1, -- MM: disabled because some recipes use group:tree for trunks
-			snappy=3, 
-			flammable=2, 
+			snappy=3,
+			flammable=2,
 			leaves=1
 		},
 		sounds = default.node_sound_leaves_defaults(),
@@ -77,8 +77,8 @@ for i in pairs(BushBranchSide) do
 --[[bottom]]"bushes_branches_center_"..TexNum..".png",
 --[[right]]	"bushes_branches_left_"..TexNum..".png",
 --[[left]]	"bushes_branches_right_"..TexNum..".png", -- MM: We could also mirror the previous here,
---[[back]]	"bushes_branches_center_"..TexNum..".png",--     unless U really want 'em 2 B different 
---[[front]]	"bushes_branches_right_"..TexNum..".png"  
+--[[back]]	"bushes_branches_center_"..TexNum..".png",--     unless U really want 'em 2 B different
+--[[front]]	"bushes_branches_right_"..TexNum..".png"
 		},
 		node_box = {
 			type = "fixed",
@@ -99,8 +99,8 @@ for i in pairs(BushBranchSide) do
 				sunlight_propagates = true,
 		groups = {
 		--	tree=1, -- MM: disabled because some recipes use group:tree for trunks
-			snappy=3, 
-			flammable=2, 
+			snappy=3,
+			flammable=2,
 			leaves=1
 		},
 		sounds = default.node_sound_leaves_defaults(),
@@ -110,23 +110,23 @@ end
 
 local BushLeafNode 			= { {1}, {2}}
 for i in pairs(BushLeafNode) do
-	local Num = BushLeafNode[i][1]	
+	local Num = BushLeafNode[i][1]
 	minetest.register_node("bushes:BushLeaves"..Num, {
 		description = "Bush Leaves "..Num,
 		drawtype = "allfaces_optional",
 		tiles = {"bushes_leaves_"..Num..".png"},
 		paramtype = "light",
-		groups = {	-- MM: Should we add leafdecay?	
+		groups = {	-- MM: Should we add leafdecay?
 			snappy=3,
 			flammable=2,
 			attached_node=1
 		},
-		sounds = default.node_sound_leaves_defaults(),    
-	})	
+		sounds = default.node_sound_leaves_defaults(),
+	})
 end
 
 abstract_bushes.grow_bush = function(pos)
-	local leaf_type = math.random(1,2)	
+	local leaf_type = math.random(1,2)
 	local bush_side_height = math.random(0,1)
 		local chance_of_bush_node_right = math.random(1,10)
 		if chance_of_bush_node_right> 5 then
@@ -144,25 +144,25 @@ abstract_bushes.grow_bush = function(pos)
 			bush_side_height = math.random(0,1)
 			local front_pos = {x=pos.x, y=pos.y+bush_side_height, z=pos.z+1}
 			abstract_bushes.grow_bush_node(front_pos,2,leaf_type)
-		end		
+		end
 		local chance_of_bush_node_back = math.random(1,10)
 		if chance_of_bush_node_back> 5 then
 			bush_side_height = math.random(0,1)
 			local back_pos = {x=pos.x, y=pos.y+bush_side_height, z=pos.z-1}
 			abstract_bushes.grow_bush_node(back_pos,0,leaf_type)
 		end
-		
+
 abstract_bushes.grow_bush_node(pos,5,leaf_type)
 end
 
 abstract_bushes.grow_bush_node = function(pos,dir, leaf_type)
-	
-	
+
+
 	local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
 	local above_right_here = {x=pos.x, y=pos.y+2, z=pos.z}
-	
+
 	local bush_branch_type = 2
-	
+
 	-- MM: I'm not sure if it's slower now than before...
 	if dir ~= 5 and leaf_type == 1 then
 		bush_branch_type = 2
@@ -178,7 +178,7 @@ abstract_bushes.grow_bush_node = function(pos,dir, leaf_type)
 		bush_branch_type = 3
 		dir = 1
 	end
-	
+
 	if minetest.get_node(right_here).name == "air"  -- instead of check_air = true,
 	or minetest.get_node(right_here).name == "default:junglegrass" then
 		minetest.set_node(right_here, {name="bushes:bushbranches"..bush_branch_type , param2=dir})
@@ -196,10 +196,11 @@ end
 
 biome_lib:register_generate_plant({
     surface = {
-		"default:dirt_with_grass", 
+		"default:dirt_with_grass",
 		"stoneage:grass_with_silex",
 		"sumpf:peat",
-		"sumpf:sumpf"
+		"sumpf:sumpf",
+		"default:dirt_with_dry_grass"
 	},
     max_count = 15,  --10,15
     rarity = 101 - 4,  --3,4
@@ -207,21 +208,21 @@ biome_lib:register_generate_plant({
 	plantlife_limit = -0.9,
   },
   abstract_bushes.grow_bush
-)		
+)
 
  abstract_bushes.grow_youngtree2 = function(pos)
-	local height = math.random(4,5)	
-	abstract_bushes.grow_youngtree_node2(pos,height)
+	local height = math.random(4,5)
+	return abstract_bushes.grow_youngtree_node2(pos,height)
 end
 
 abstract_bushes.grow_youngtree_node2 = function(pos, height)
-	
-	
+
+
 	local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
 	local above_right_here = {x=pos.x, y=pos.y+2, z=pos.z}
 	local two_above_right_here = {x=pos.x, y=pos.y+3, z=pos.z}
 	local three_above_right_here = {x=pos.x, y=pos.y+4, z=pos.z}
-	 
+
 	if minetest.get_node(right_here).name == "air"  -- instead of check_air = true,
 	or minetest.get_node(right_here).name == "default:junglegrass" then
 		if height == 4 then
@@ -234,17 +235,17 @@ abstract_bushes.grow_youngtree_node2 = function(pos, height)
 				minetest.set_node(three_above_right_here, {name="bushes:BushLeaves1" })
 				minetest.set_node(three_above_right_here_south, {name="bushes:BushLeaves1" })
 		end
-		 
+
 	end
 end
 
-
 biome_lib:register_generate_plant({
     surface = {
-		"default:dirt_with_grass", 
+		"default:dirt_with_grass",
 		"stoneage:grass_with_silex",
 		"sumpf:peat",
-		"sumpf:sumpf"
+		"sumpf:sumpf",
+		"default:dirt_with_dry_grass"
 	},
     max_count = 55,  --10,15
     rarity = 101 - 4,  --3,4
@@ -252,6 +253,6 @@ biome_lib:register_generate_plant({
 	plantlife_limit = -0.9,
   },
   abstract_bushes.grow_youngtree2
-)	
-	 
+)
+
 		--http://dev.minetest.net/Node_Drawtypes

bushes_classic/cooking.lua

@@ -12,6 +12,17 @@ minetest.register_craft({
 
 -- Sugar
 
+-- Use the sugar from farming redo if available
+if minetest.get_modpath("farming") and farming.mod == "redo" then
+	--[[ We really have nothing to do to use farming:sugar in the recipes
+	     because they use the generic group group:food_sugar
+	     which is added to the groups list of farming:sugar by the mod "food".
+	--]]
+
+	--Temporary alias to replace existing bushes:sugar in the world
+	minetest.register_alias("bushes:sugar", "farming:sugar")
+
+else
 minetest.register_craftitem(":bushes:sugar", {
     description = S("Sugar"),
     inventory_image = "bushes_sugar.png",
@@ -25,6 +36,7 @@ minetest.register_craft({
 	{ "default:papyrus", "default:papyrus" },
     },
 })
+end
 
 for i, berry in ipairs(bushes_classic.bushes) do
 	local desc = bushes_classic.bushes_descriptions[i]

bushes_classic/init.lua

@@ -56,4 +56,4 @@ biome_lib:spawn_on_surfaces({
 
 minetest.register_alias("bushes:basket_pies", "bushes:basket_strawberry")
 
-print(S("[Bushes] Loaded."))
+minetest.log("action", S("[Bushes] Loaded."))

bushes_classic/nodes.lua

@@ -11,7 +11,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	-- find out which bush type we are dealing with
 	local bush_name   = ""
 	local can_harvest = false
-	
+
 	if oldnode.name == "bushes:fruitless_bush" then
 		-- this bush has not grown fruits yet (but will eventually)
 		bush_name = oldmetadata.fields.bush_type