From 0a3b4466c0269cbd6b732169d93526a65b7c79a9 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Sat, 28 Mar 2020 20:01:50 +0000
Subject: [PATCH] add compatibility for new dry_soil nodes

---
 mapgen.lua | 5 +++--
 soil.lua   | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mapgen.lua b/mapgen.lua
index 6d8278d..beacd21 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -36,7 +36,8 @@ register_plant("potato_3", 15, 40, nil, "", -1, farming.potato)
 register_plant("tomato_7", 5, 20, nil, "", -1, farming.tomato)
 register_plant("corn_7", 12, 22, nil, "", -1, farming.corn)
 register_plant("coffee_5", 20, 45, {"default:dirt_with_dry_grass",
-	"default:dirt_with_rainforest_litter"}, "", -1, farming.coffee)
+	"default:dirt_with_rainforest_litter",
+	"default:dry_dirt_with_dry_grass"}, "", -1, farming.coffee)
 register_plant("raspberry_4", 3, 10, nil, "", -1, farming.raspberry)
 register_plant("rhubarb_3", 3, 15, nil, "", -1, farming.rhubarb)
 register_plant("blueberry_4", 3, 10, nil, "", -1, farming.blueberry)
@@ -129,7 +130,7 @@ end
 if farming.pineapple then
 minetest.register_decoration({
 	deco_type = "simple",
-	place_on = {"default:dirt_with_dry_grass"},
+	place_on = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"},
 	sidelen = 16,
 	noise_params = {
 		offset = 0,
diff --git a/soil.lua b/soil.lua
index d379f5d..609fe72 100644
--- a/soil.lua
+++ b/soil.lua
@@ -22,6 +22,9 @@ minetest.register_node("farming:soil_wet", {
 -- sand is not soil, change existing sand-soil to use normal soil
 minetest.register_alias("farming:desert_sand_soil", "farming:soil")
 minetest.register_alias("farming:desert_sand_soil_wet", "farming:soil_wet")
+-- also change new dry soil to use normal soil
+minetest.register_alias("farming:dry_soil", "farming:soil")
+minetest.register_alias("farming:dry_soil_wet", "farming:soil_wet")
 
 -- if water near soil then change to wet soil
 minetest.register_abm({