From b96974e2539088cd31798781256832736dcb796a Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Wed, 10 Jan 2018 17:55:17 +0100
Subject: [PATCH] Fix biome ores being generated in all biomes

---
 mods/MAPGEN/mcl_biomes/init.lua      | 71 +++++++++++++++++++++++++---
 mods/MAPGEN/mcl_mapgen_core/init.lua | 50 +-------------------
 2 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index e6b554feb3..48de5335e9 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -1225,7 +1225,60 @@ local function register_dimension_biomes()
 
 end
 
--- Register “fake” ores directly related to the biomes
+-- Register ores which are limited by biomes. For all mapgens except flat and singlenode.
+local function register_biome_ores()
+	local stonelike = {"mcl_core:stone", "mcl_core:diorite", "mcl_core:andesite", "mcl_core:granite"}
+
+	-- Emeralds
+	minetest.register_ore({
+		ore_type       = "scatter",
+		ore            = "mcl_core:stone_with_emerald",
+		wherein        = stonelike,
+		clust_scarcity = 16384,
+		clust_num_ores = 1,
+		clust_size     = 1,
+		y_min          = mcl_worlds.layer_to_y(4),
+		y_max          = mcl_worlds.layer_to_y(32),
+		biomes         = { "ExtremeHills", "ExtremeHills_beach", "ExtremeHills_ocean" },
+	})
+
+	-- Rarely replace stone with stone monster eggs.
+	-- In v6 this can happen anywhere, in other mapgens only in Extreme Hills.
+	local monster_egg_scarcity
+	if mg_name == "v6" then
+		monster_egg_scarcity = 28 * 28 * 28
+	else
+		monster_egg_scarcity = 26 * 26 * 26
+	end
+	minetest.register_ore({
+		ore_type       = "scatter",
+		ore            = "mcl_monster_eggs:monster_egg_stone",
+		wherein        = "mcl_core:stone",
+		clust_scarcity = monster_egg_scarcity,
+		clust_num_ores = 3,
+		clust_size     = 2,
+		y_min          = mcl_vars.mg_overworld_min,
+		y_max          = mcl_worlds.layer_to_y(61),
+		biomes         = { "ExtremeHills", "ExtremeHills_beach", "ExtremeHills_ocean" },
+	})
+
+	-- Bonus gold spawn in Mesa
+	if mg_name ~= "v6" then
+		minetest.register_ore({
+			ore_type       = "scatter",
+			ore            = "mcl_core:stone_with_gold",
+			wherein        = stonelike,
+			clust_scarcity = 3333,
+			clust_num_ores = 5,
+			clust_size     = 3,
+			y_min          = mcl_worlds.layer_to_y(32),
+			y_max          = mcl_worlds.layer_to_y(79),
+			biomes         = { "Mesa", "Mesa_sandlevel", "Mesa_ocean" },
+		})
+	end
+end
+
+-- Register “fake” ores directly related to the biomes. These are mostly low-level landscape alternations
 local function register_biomelike_ores()
 
 	-- Random coarse dirt floor in Mega Taiga and Mesa Plateau F
@@ -3150,15 +3203,21 @@ local function register_dimension_decorations()
 	-- TODO
 end
 
+
 --
 -- Detect mapgen to select functions
 --
 if mg_name ~= "singlenode" then
-	if mg_name ~= "v6" and mg_name ~= "flat" then
-		register_biomes()
-		register_biomelike_ores()
-		register_decorations()
-	elseif mg_name == "flat" then
+	if mg_name ~= "flat" then
+		if mg_name ~= "v6" then
+			register_biomes()
+			register_biomelike_ores()
+		end
+		register_biome_ores()
+		if mg_name ~= "v6" then
+			register_decorations()
+		end
+	else
 		-- Implementation of Minecraft's Superflat mapgen, classic style
 		minetest.clear_registered_biomes()
 		minetest.clear_registered_decorations()
diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index 686d6ba07f..65eb9dd4e2 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -303,21 +303,6 @@ minetest.register_ore({
 	y_max          = mcl_worlds.layer_to_y(33),
 })
 
--- Bonus spawn in Mesa
-if mg_name ~= "v6" then
-	minetest.register_ore({
-		ore_type       = "scatter",
-		ore            = "mcl_core:stone_with_gold",
-		wherein        = stonelike,
-		clust_scarcity = 3333,
-		clust_num_ores = 5,
-		clust_size     = 3,
-		y_min          = mcl_worlds.layer_to_y(32),
-		y_max          = mcl_worlds.layer_to_y(79),
-		biomes         = { "Mesa", "Mesa_sandlevel", "Mesa_ocean" },
-	})
-end
-
 --
 -- Diamond
 --
@@ -453,20 +438,6 @@ if mg_name == "v6" then
 		y_min          = mcl_worlds.layer_to_y(30),
 		y_max          = mcl_worlds.layer_to_y(32),
 	})
-else
-	-- Generate in Extreme Hills biome only
-
-	minetest.register_ore({
-		ore_type       = "scatter",
-		ore            = "mcl_core:stone_with_emerald",
-		wherein        = stonelike,
-		clust_scarcity = 16384,
-		clust_num_ores = 1,
-		clust_size     = 1,
-		y_min          = mcl_worlds.layer_to_y(4),
-		y_max          = mcl_worlds.layer_to_y(32),
-		biomes         = { "ExtremeHills", "ExtremeHills_beach", "ExtremeHills_ocean" },
-	})
 end
 
 --
@@ -654,25 +625,8 @@ minetest.register_ore({
 
 end
 
--- Rarely replace stone with stone monster eggs.
--- In v6 this can happen anywhere, in other mapgens only in Extreme Hills.
-local monster_egg_scarcity
-if mg_name == "v6" then
-	monster_egg_scarcity = 28 * 28 * 28
-else
-	monster_egg_scarcity = 26 * 26 * 26
-end
-minetest.register_ore({
-	ore_type       = "scatter",
-	ore            = "mcl_monster_eggs:monster_egg_stone",
-	wherein        = "mcl_core:stone",
-	clust_scarcity = monster_egg_scarcity,
-	clust_num_ores = 3,
-	clust_size     = 2,
-	y_min          = mcl_vars.mg_overworld_min,
-	y_max          = mcl_worlds.layer_to_y(61),
-	biomes         = { "ExtremeHills", "ExtremeHills_beach", "ExtremeHills_ocean" },
-})
+
+
 
 
 local function register_mgv6_decorations()