From 8b5d0fe0fa8717a40e18d0398ef216b53e05676e Mon Sep 17 00:00:00 2001
From: Gael-de-Sailly <gael.chretien@akeonet.com>
Date: Mon, 31 Aug 2015 12:11:53 +0200
Subject: [PATCH] Use default:dirt_with_dry_grass

---
 minetestforfun_game/mods/default/functions.lua |  4 ++--
 mods/mobs/dirtmonster.lua                      |  2 +-
 mods/mobs/minotaur.lua                         |  2 +-
 mods/plantlife_modpack/bushes/init.lua         |  4 ++--
 mods/plantlife_modpack/molehills/init.lua      |  2 +-
 mods/watershed/nodes.lua                       | 11 +----------
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/minetestforfun_game/mods/default/functions.lua b/minetestforfun_game/mods/default/functions.lua
index 7c4b09b4..2a4f016a 100755
--- a/minetestforfun_game/mods/default/functions.lua
+++ b/minetestforfun_game/mods/default/functions.lua
@@ -209,7 +209,7 @@ function default.grow_cactus(pos, node)
 	end
 	pos.y = pos.y - 1
 	local name = minetest.get_node(pos).name --MFF
-	if minetest.get_item_group(name, "sand") == 0 and name ~= "watershed:drygrass" then --MFF
+	if minetest.get_item_group(name, "sand") == 0 and name ~= "default:dirt_with_dry_grass" then --MFF
 		return
 	end
 	pos.y = pos.y + 1
@@ -251,7 +251,7 @@ end
 
 minetest.register_abm({
 	nodenames = {"default:cactus"},
-	neighbors = {"group:sand", "watershed:drygrass"}, --MFF
+	neighbors = {"group:sand", "default:dirt_with_dry_grass"}, --MFF
 	interval = 60,
 	chance = 25,
 	action = function(...)
diff --git a/mods/mobs/dirtmonster.lua b/mods/mobs/dirtmonster.lua
index 5cf84fdd..40a84930 100755
--- a/mods/mobs/dirtmonster.lua
+++ b/mods/mobs/dirtmonster.lua
@@ -51,6 +51,6 @@ mobs:register_mob("mobs:dirt_monster", {
 	},
 })
 -- spawn on dirt_with_grass and drygrass between -1 and 5 light, 1 in 10000 change, 1 dirt monster in area up to 31000 in height
-mobs:spawn_specific("mobs:dirt_monster", {"default:dirt_with_grass", "watershed:drygrass"}, {"air"}, -1, 5, 30, 10000, 1, -31000, 31000, false)
+mobs:spawn_specific("mobs:dirt_monster", {"default:dirt_with_grass", "default:dirt_with_dry_grass"}, {"air"}, -1, 5, 30, 10000, 1, -31000, 31000, false)
 -- register spawn egg
 mobs:register_egg("mobs:dirt_monster", "Dirt Monster", "mobs_dirt_monster_inv.png", 1)
diff --git a/mods/mobs/minotaur.lua b/mods/mobs/minotaur.lua
index 6c949076..ff3c4a9b 100755
--- a/mods/mobs/minotaur.lua
+++ b/mods/mobs/minotaur.lua
@@ -60,7 +60,7 @@ mobs:register_mob("mobs:minotaur", {
 	},
 })
 -- spawns on desert sand between -1 and 20 light, 1 in 20000 chance, 1 Minotaur in area up to 31000 in height
-mobs:spawn_specific("mobs:minotaur", {"watershed:drygrass"}, {"air"}, -1, 20, 30, 100000, 1, -31000, 31000, false)
+mobs:spawn_specific("mobs:minotaur", {"default:dirt_with_dry_grass"}, {"air"}, -1, 20, 30, 100000, 1, -31000, 31000, false)
 -- register spawn egg
 mobs:register_egg("mobs:minotaur", "Minotaur", "mobs_minotaur_inv.png", 1)
 
diff --git a/mods/plantlife_modpack/bushes/init.lua b/mods/plantlife_modpack/bushes/init.lua
index c20c804c..977fcfb6 100755
--- a/mods/plantlife_modpack/bushes/init.lua
+++ b/mods/plantlife_modpack/bushes/init.lua
@@ -200,7 +200,7 @@ biome_lib:register_generate_plant({
 		"stoneage:grass_with_silex",
 		"sumpf:peat",
 		"sumpf:sumpf",
-		"watershed:drygrass"
+		"default:dirt_with_dry_grass"
 	},
     max_count = 15,  --10,15
     rarity = 101 - 4,  --3,4
@@ -246,7 +246,7 @@ biome_lib:register_generate_plant({
 		"stoneage:grass_with_silex",
 		"sumpf:peat",
 		"sumpf:sumpf",
-		"watershed:drygrass"
+		"default:dirt_with_dry_grass"
 	},
     max_count = 55,  --10,15
     rarity = 101 - 4,  --3,4
diff --git a/mods/plantlife_modpack/molehills/init.lua b/mods/plantlife_modpack/molehills/init.lua
index 3db9c04b..c3a707e3 100755
--- a/mods/plantlife_modpack/molehills/init.lua
+++ b/mods/plantlife_modpack/molehills/init.lua
@@ -74,7 +74,7 @@ biome_lib:register_generate_plant({
 )
 
 biome_lib:register_generate_plant({
-    surface = {"watershed:drygrass"},
+    surface = {"default:dirt_with_dry_grass"},
     max_count = Molehills_Max_Count,
     rarity = 97,
     min_elevation = 1,
diff --git a/mods/watershed/nodes.lua b/mods/watershed/nodes.lua
index 10e3228f..81724e2f 100755
--- a/mods/watershed/nodes.lua
+++ b/mods/watershed/nodes.lua
@@ -34,16 +34,7 @@ minetest.register_alias("watershed:cactus", "default:cactus")
 
 minetest.register_alias("watershed:goldengrass", "default:dry_shrub")
 
-minetest.register_node("watershed:drygrass", {
-	description = "Dry Dirt",
-	tiles = {"watershed_drygrass.png"},
-	is_ground_content = false,
-	groups = {crumbly=1, soil=1},
-	drop = "default:dirt",
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_grass_footstep", gain=0.4},
-	}),
-})
+minetest.register_alias("watershed:drygrass", "default:dirt_with_dry_grass")
 
 minetest.register_alias("watershed:permafrost", "default:dirt")