From cfdbe7146675fa06d79a9882da2af6e9892a2bf6 Mon Sep 17 00:00:00 2001
From: crabman77 <crabman77.github@gmail.com>
Date: Sat, 6 Jun 2015 02:01:38 +0200
Subject: [PATCH] added condition if farming mod enabled then farming:straw
 replace darkage:straw to crafting mores Straw Stair Slab

---
 mods/darkage/crafts.lua | 18 ++++++++++++++++-
 mods/darkage/stairs.lua | 44 ++++++++++++++++++++++++++++-------------
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/mods/darkage/crafts.lua b/mods/darkage/crafts.lua
index a95f5699..2897fd16 100755
--- a/mods/darkage/crafts.lua
+++ b/mods/darkage/crafts.lua
@@ -96,7 +96,7 @@ if minetest.get_modpath("farming") == nil then
 	minetest.register_craft({
 		output = "darkage:straw 2",
 		recipe = {
-		{"default:dry_shrub","default:dry_shrub"},
+			{"default:dry_shrub","default:dry_shrub"},
 			{"default:dry_shrub","default:dry_shrub"},
 		}
 	})
@@ -124,6 +124,22 @@ if minetest.get_modpath("farming") == nil then
 		}
 	})
 else
+	minetest.register_craft({
+		output = "farming:straw 2",
+		recipe = {
+			{"default:dry_shrub","default:dry_shrub"},
+			{"default:dry_shrub","default:dry_shrub"},
+		}
+	})
+	
+	minetest.register_craft({
+		output = "farming:straw 2",
+		recipe = {
+			{"darkage:dry_leaves","darkage:dry_leaves"},
+			{"darkage:dry_leaves","darkage:dry_leaves"},
+		}
+	})
+	
 	minetest.register_craft({
 		output = "darkage:straw_bale",
 		recipe = {
diff --git a/mods/darkage/stairs.lua b/mods/darkage/stairs.lua
index ee1a12b1..5be881af 100755
--- a/mods/darkage/stairs.lua
+++ b/mods/darkage/stairs.lua
@@ -97,13 +97,21 @@ if stairsplus then
 	})
 	--if not farming:straw
 	if minetest.get_modpath("farming") == nil then
-	stairsplus:register_all("darkage", "straw", "darkage:straw", {
-		description = "Straw",
-		tiles = {"darkage_straw.png"},
-		groups = {snappy=3, flammable=2},
-		sounds = default.node_sound_stone_defaults(),
-		sunlight_propagates = true,
-	})
+		stairsplus:register_all("darkage", "straw", "darkage:straw", {
+			description = "Straw",
+			tiles = {"darkage_straw.png"},
+			groups = {snappy=3, flammable=2},
+			sounds = default.node_sound_stone_defaults(),
+			sunlight_propagates = true,
+		})
+	else
+		stairsplus:register_all("darkage", "straw", "farming:straw", {
+			description = "Straw",
+			tiles = {"darkage_straw.png"},
+			groups = {snappy=3, flammable=2},
+			sounds = default.node_sound_stone_defaults(),
+			sunlight_propagates = true,
+		})
 	end
 	
 	stairsplus:register_all("darkage", "straw_bale", "darkage:straw_bale", {
@@ -271,13 +279,21 @@ elseif stairs then
 	)
 		--if not farming:straw
 	if minetest.get_modpath("farming") == nil then
-	stairs.register_stair_and_slab("straw", "darkage:straw",
-		{snappy=3, flammable=2},
-		{"darkage_straw.png"},
-		"Straw Stair",
-		"Straw Slab",
-		default.node_sound_stone_defaults()
-	)
+		stairs.register_stair_and_slab("straw", "darkage:straw",
+			{snappy=3, flammable=2},
+			{"darkage_straw.png"},
+			"Straw Stair",
+			"Straw Slab",
+			default.node_sound_stone_defaults()
+		)
+	else
+		stairs.register_stair_and_slab("straw", "farming:straw",
+			{snappy=3, flammable=2},
+			{"darkage_straw.png"},
+			"Straw Stair",
+			"Straw Slab",
+			default.node_sound_stone_defaults()
+		)
 	end
 	stairs.register_stair_and_slab("straw_bale", "darkage:straw_bale",
 		{snappy=2, flammable=2},