Fix dry dirt namespace

mods/creatures/zombie.lua

@@ -14,7 +14,7 @@ local z_sound_normal = "creatures_zombie"
 local z_sound_hit = "creatures_zombie_hit"
 local z_sound_dead = "creatures_zombie_death"
 
-creatures.z_spawn_nodes = {"default:dirt_with_grass","default:stone","default:dirt","default:desert_sand"}
+creatures.z_spawn_nodes = {"default:dry_dirt","default:stone","default:dirt","default:desert_sand"}
 creatures.z_spawner_range = 17
 creatures.z_spawner_max_mobs = 6
 

mods/default/functions.lua

@@ -210,7 +210,7 @@ minetest.register_abm({
 	end,
 })
 
---
+--[[
 -- Papyrus and cactus growing
 --
 
@@ -264,6 +264,7 @@ minetest.register_abm({
 		end
 	end,
 })
+]]
 
 --
 -- Leafdecay

mods/default/mapgen.lua

@@ -12,19 +12,19 @@ minetest.register_alias("mapgen_jungletree", "default:jungletree")
 minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
 minetest.register_alias("mapgen_apple", "default:apple")
 minetest.register_alias("mapgen_water_source", "air")
-minetest.register_alias("mapgen_dirt", "default:dirt_with_grass")
+minetest.register_alias("mapgen_dirt", "default:dry_dirt")
 minetest.register_alias("mapgen_sand", "default:sand")
 minetest.register_alias("mapgen_gravel", "default:gravel")
 minetest.register_alias("mapgen_clay", "default:hardened_clay")
 minetest.register_alias("mapgen_lava_source", "default:lava_source")
 minetest.register_alias("mapgen_cobble", "default:cobble")
 minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
-minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
+minetest.register_alias("mapgen_dirt_with_grass", "default:dry_dirt")
 minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
 minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
 minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
 minetest.register_alias("mapgen_mese", "default:stone")
-minetest.register_alias("mapgen_desert_sand", "default:dirt_with_grass")
+minetest.register_alias("mapgen_desert_sand", "default:dry_dirt")
 minetest.register_alias("mapgen_desert_stone", "default:stone")
 minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
 
@@ -308,7 +308,7 @@ function make_dead_tree(pos, size)
 end
 
 local dirt_snow = minetest.get_content_id("default:dirt_with_snow")
-local dirt_grass = minetest.get_content_id("default:dirt_with_grass")
+local dirt_dry = minetest.get_content_id("default:dry_dirt")
 local leaves = minetest.get_content_id("default:leaves")
 local snow = minetest.get_content_id("default:snow")
 local air = minetest.get_content_id("air")
@@ -323,7 +323,7 @@ local function make_snow(min,max,data,va,rnd)
 	   for zi=0, cnt do
 		local p = {x=min.x+xi,y=max.y-yi,z=min.z+zi}
 		local pi = va:indexp(p)
-		if data[pi] == dirt_grass then
+		if data[pi] == dirt_dry then
 			data[pi] = dirt_snow
 		end
 		if data[pi] == dirt_snow then-- and p.y > SNOW_START+3+rnd then
@@ -371,7 +371,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 					end
 				end
 				-- If dry dirt make dead tree
-				if ground_y and ground_n and ground_n.name == "default:dirt_with_grass" then
+				if ground_y and ground_n and ground_n.name == "default:dry_dort" then
 					make_dead_tree({x=x,y=ground_y+1,z=z})
 				end
 			end
@@ -438,7 +438,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 						minetest.registered_nodes[nn].buildable_to then
 						nn = minetest.get_node({x=x,y=ground_y,z=z}).name
 						-- If desert sand, add dry shrub
-						if nn == "default:dirt_with_grass" then
+						if nn == "default:dry_dirt" then
 							minetest.set_node(p,{name="default:dry_shrub"})
 						end
 					end

mods/default/nodes.lua

@@ -82,7 +82,7 @@ minetest.register_node("default:desert_stonebrick", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("default:dirt_with_grass", {
+minetest.register_node("default:dry_dirt", {
 	description = "Dirt",
 	tiles = {"default_dry_dirt.png"},
 	is_ground_content = true,
@@ -95,7 +95,7 @@ minetest.register_node("default:grass", {
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	is_ground_content = true,
 	groups = {crumbly=default.dig.dirt_with_grass,soil=1,not_in_creative_inventory=1},
-	drop = 'default:dirt_with_grass',
+	drop = 'default:dry_dirt',
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.25},
 	}),
@@ -110,7 +110,7 @@ minetest.register_node("default:dirt_with_snow", {
 	--	    fixed = {-0.5,-0.5,-0.5,0.5,0.5,0.5}},
 	is_ground_content = true,
 	groups = {crumbly=default.dig.dirt_with_grass},
-	drop = 'default:dirt_with_grass',
+	drop = 'default:dry_dirt',
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_snow_footstep", gain=0.25},
 	}),
@@ -122,7 +122,7 @@ minetest.register_node("default:dirt", {
 	tiles = {"default_dry_dirt.png"},
 	is_ground_content = true,
 	groups = {crumbly=default.dig.dirt,soil=1},
-	drop = 'default:dirt_with_grass',
+	drop = 'default:dry_dirt',
 	sounds = default.node_sound_dirt_defaults(),
 })
 
@@ -1260,7 +1260,7 @@ minetest.register_node("default:snow", {
 	}),
 	--[[after_construct = function(pos)
 		pos.y = pos.y - 1
-		if minetest.get_node(pos).name == "default:dirt_with_grass" then
+		if minetest.get_node(pos).name == "default:dry_dirt" then
 			minetest.set_node(pos, {name="default:dirt_with_snow"})
 		end
 	end,]]

mods/farming/init.lua

@@ -7,7 +7,7 @@
 minetest.register_node("farming:soil", {
 	description = "Soil",
 	tiles = {"farming_soil.png", "default_dirt.png"},
-	drop = "default:dirt_with_grass",
+	drop = "default:dry_dirt",
 	is_ground_content = true,
 	groups = {crumbly=default.dig.dirt, not_in_creative_inventory=1, soil=2},
 	sounds = default.node_sound_dirt_defaults(),
@@ -17,7 +17,7 @@ minetest.register_node("farming:soil", {
 minetest.register_node("farming:soil_wet", {
 	description = "Wet Soil",
 	tiles = {"farming_soil_wet.png", "farming_soil_wet_side.png"},
-	drop = "default:dirt_with_grass",
+	drop = "default:dry_dirt",
 	is_ground_content = true,
 	groups = {crumbly=default.dig.dirt, not_in_creative_inventory=1, soil=3},
 	sounds = default.node_sound_dirt_defaults(),
@@ -42,7 +42,7 @@ minetest.register_abm({
 			if node.name == "farming:soil" then
 				-- only turn it back if there is no plant on top of it
 				if minetest.get_item_group(nn, "plant") == 0 then
-				--	minetest.set_node(pos, {name="default:dirt_with_grass"})
+				--	minetest.set_node(pos, {name="default:dry_dirt"})
 				end
 				
 			-- if its wet turn it back into dry soil
@@ -62,7 +62,7 @@ minetest.register_abm({
 		local nn = minetest.get_node(pos).name
 		pos.y = pos.y-1
 		if minetest.registered_nodes[nn] and minetest.get_item_group(nn, "plant") == 0 then
-			minetest.set_node(pos, {name="default:dirt_with_grass"})
+			minetest.set_node(pos, {name="default:dry_dirt"})
 		end
 	end
 
@@ -74,7 +74,7 @@ minetest.register_abm({
 	chance = 200,
 	action = function(p, node)
 
-		for _,pos in ipairs(minetest.find_nodes_in_area({x=p.x-3, y=p.y-4, z=p.z-3}, {x=p.x+3, y=p.y+1, z=p.z+3}, {"default:dirt_with_grass"})) do
+		for _,pos in ipairs(minetest.find_nodes_in_area({x=p.x-3, y=p.y-4, z=p.z-3}, {x=p.x+3, y=p.y+1, z=p.z+3}, {"default:dry_dirt"})) do
 			pos.y = pos.y+1
 			local nn = minetest.get_node(pos).name
 			local ll = 0
@@ -91,7 +91,7 @@ minetest.register_abm({
 })]]
 
 minetest.register_abm({
-	nodenames = {"default:dirt_with_grass"},
+	nodenames = {"default:dry_dirt"},
 	interval = 2,
 	chance = 200,
 	action = function(pos, node)
@@ -115,13 +115,13 @@ minetest.register_abm({
 	chance = 20,
 	action = function(pos, node)
 		if not minetest.find_node_near(pos, 6, {"group:water"}) then
-			minetest.set_node(pos, {name="default:dirt_with_grass"})
+			minetest.set_node(pos, {name="default:dry_dirt"})
 		else
 			pos.y = pos.y+1
 			local nn = minetest.get_node(pos).name
 			pos.y = pos.y-1
 			if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].walkable then
-				minetest.set_node(pos, {name="default:dirt_with_grass"})
+				minetest.set_node(pos, {name="default:dry_dirt"})
 			end
 		end
 	end

mods/ruins/init.lua

@@ -197,7 +197,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	if noise1 < 0.36 or noise1 > -0.36 then
 		local mpos = {x=math.random(minp.x,maxp.x), y=math.random(minp.y,maxp.y), z=math.random(minp.z,maxp.z)}
 		minetest.after(0.5, function()
-		 p2 = minetest.find_node_near(mpos, 25, {"default:dirt_with_grass"})	
+		 p2 = minetest.find_node_near(mpos, 25, {"default:dry_dirt"})	
 		 if not p2 or p2 == nil or p2.y < 0 then return end
 		
 		  make(p2,{x=math.random(6,9),z=math.random(6,9)})
@@ -207,7 +207,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		
 		local mpos = {x=math.random(minp.x,maxp.x), y=math.random(minp.y,maxp.y), z=math.random(minp.z,maxp.z)}
 		minetest.after(0.5, function()
-		 p2 = minetest.find_node_near(mpos, 25, {"default:dirt_with_grass"})	
+		 p2 = minetest.find_node_near(mpos, 25, {"default:dry_dirt"})	
 		 if not p2 or p2 == nil or p2.y < 0 then return end
 		  p2.y = p2.y+1
 		  local n = minetest.get_node(p2)