From 1189b8d2998ba3f132fff8a63be30405206b418f Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 21 Aug 2017 16:22:37 +0200
Subject: [PATCH] Remove more helper recipes

---
 mods/MISC/mcl_temp_helper_recipes/init.lua | 64 ++++++++++------------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua
index 0209f1761..23288bf95 100644
--- a/mods/MISC/mcl_temp_helper_recipes/init.lua
+++ b/mods/MISC/mcl_temp_helper_recipes/init.lua
@@ -57,15 +57,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "mcl_nether:nether_wart_item",
-	recipe = {
-		{"mcl_nether:soul_sand", "mcl_core:obsidian", "mcl_nether:soul_sand"},
-		{"mcl_core:obsidian", "mcl_core:goldblock", "mcl_core:obsidian"},
-		{"mcl_nether:soul_sand", "mcl_core:obsidian", "mcl_nether:soul_sand"},
-	}
-})
-
 minetest.register_craft({
 	output = "3d_armor:helmet_chain",
 	recipe = {
@@ -124,34 +115,39 @@ minetest.register_craft({
 		{ "mcl_core:glass_black", "mcl_core:glass_black", "mcl_core:glass_black", },
 	}
 })
-
 -- 2 discs are dropped by creeper
 -- 1 disc is droppd by zombie
 -- TODO: Remove/fix these drops when creeper drops music discs properly
 
-minetest.register_craft({
-	output = "mcl_core:darksapling",
-	recipe = {
-		{ "mcl_core:sapling", "mcl_core:sapling", "mcl_core:sapling" },
-		{ "mcl_core:sapling", "mcl_core:sapling", "mcl_core:sapling" },
-		{ "mcl_core:sapling", "mcl_core:sapling", "mcl_core:sapling" },
-	},
-})
 
-minetest.register_craft({
-	output = "mcl_core:acaciasapling",
-	recipe = {
-		{ "mcl_core:junglesapling", "mcl_core:junglesapling", "mcl_core:junglesapling" },
-		{ "mcl_core:junglesapling", "mcl_core:junglesapling", "mcl_core:junglesapling" },
-		{ "mcl_core:junglesapling", "mcl_core:junglesapling", "mcl_core:junglesapling" },
-	},
-})
+-- Saplings, to complete the set of saplings in v6 mapgen.
+-- 3 tree species are missing in v6.
+local mg_name = minetest.get_mapgen_setting("mg_name")
+if mg_name == "v6" then
+	minetest.register_craft({
+		output = "mcl_core:darksapling",
+		recipe = {
+			{ "mcl_core:sapling", "mcl_core:sapling", "mcl_core:sapling" },
+			{ "mcl_core:sapling", "mcl_core:sapling", "mcl_core:sapling" },
+			{ "mcl_core:sapling", "mcl_core:sapling", "mcl_core:sapling" },
+		},
+	})
 
-minetest.register_craft({
-	output = "mcl_core:birchsapling",
-	recipe = {
-		{ "mcl_core:sprucesapling", "mcl_core:sprucesapling", "mcl_core:sprucesapling" },
-		{ "mcl_core:sprucesapling", "mcl_core:sprucesapling", "mcl_core:sprucesapling" },
-		{ "mcl_core:sprucesapling", "mcl_core:sprucesapling", "mcl_core:sprucesapling" },
-	},
-})
+	minetest.register_craft({
+		output = "mcl_core:acaciasapling",
+		recipe = {
+			{ "mcl_core:junglesapling", "mcl_core:junglesapling", "mcl_core:junglesapling" },
+			{ "mcl_core:junglesapling", "mcl_core:junglesapling", "mcl_core:junglesapling" },
+			{ "mcl_core:junglesapling", "mcl_core:junglesapling", "mcl_core:junglesapling" },
+		},
+	})
+
+	minetest.register_craft({
+		output = "mcl_core:birchsapling",
+		recipe = {
+			{ "mcl_core:sprucesapling", "mcl_core:sprucesapling", "mcl_core:sprucesapling" },
+			{ "mcl_core:sprucesapling", "mcl_core:sprucesapling", "mcl_core:sprucesapling" },
+			{ "mcl_core:sprucesapling", "mcl_core:sprucesapling", "mcl_core:sprucesapling" },
+		},
+	})
+end