From 2d5487396395b8d7264e26a5599725ce197cb38c Mon Sep 17 00:00:00 2001
From: ezhh <owlecho@live.com>
Date: Wed, 15 Nov 2017 03:39:18 +0000
Subject: [PATCH] Add coloured stone

---
 mods/abri/mapgen.lua |  4 ++--
 mods/abri/nodes.lua  | 31 ++++++++++++++++---------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/mods/abri/mapgen.lua b/mods/abri/mapgen.lua
index 1d436da..19d9fb3 100644
--- a/mods/abri/mapgen.lua
+++ b/mods/abri/mapgen.lua
@@ -4,7 +4,7 @@
 assert(minetest.get_mapgen_setting("mg_name") ~= "v6", "Please choose another Mapgen.")
 
 -- mapgen aliases
-minetest.register_alias("mapgen_stone", "abri:stone")
+minetest.register_alias("mapgen_stone", "abri:stone_black")
 minetest.register_alias("mapgen_water_source", "abri:blue_water_source")
 minetest.register_alias("mapgen_river_water_source", "abri:blue_water_source")
 
@@ -30,7 +30,7 @@ for i in ipairs(col_list) do
 		depth_top = 1,
 		node_filler = "abri:dirt",
 		depth_filler = 3,
-		node_stone = "abri:stone",
+		node_stone = "abri:stone_"..col,
 		-- node_water_top = "default:ice",
 		-- depth_water_top = 1,
 		node_water = "abri:"..col.."_water_source",
diff --git a/mods/abri/nodes.lua b/mods/abri/nodes.lua
index ef3fc20..0fa2d94 100644
--- a/mods/abri/nodes.lua
+++ b/mods/abri/nodes.lua
@@ -1,13 +1,4 @@
 
-minetest.register_node("abri:stone", {
-	description = "Stone",
-	tiles = {"abri_stone.png"},
-	groups = {cracky = 3, stone = 1},
-	drop = 'abri:stone',
-	legacy_mineral = true,
-	-- sounds = default.node_sound_stone_defaults(),
-})
-
 minetest.register_node("abri:dirt", {
 	description = "Dirt",
 	tiles = {"abri_dirt.png"},
@@ -16,18 +7,20 @@ minetest.register_node("abri:dirt", {
 })
 
 local col_list = {
-	{"black", "292421"}, {"purple", "800080"}, {"blue", "0000FF"},
-	{"cyan", "00FFFF"}, {"green", "00FF00"}, {"yellow", "FFFF00"},
-	{"orange", "FF6103"}, {"red", "FF0000"}, {"magenta", "FF00FF"},
-	{"white", "FFFFFF"},
+	{"black", "Black", "292421"}, {"purple", "Purple", "800080"},
+	{"blue", "Blue", "0000FF"}, {"cyan", "Cyan", "00FFFF"},
+	{"green", "Green", "00FF00"}, {"yellow", "Yellow", "FFFF00"},
+	{"orange", "Orange", "FF6103"}, {"red", "Red", "FF0000"},
+	{"magenta", "Magenta", "FF00FF"}, {"white", "White", "FFFFFF"},
 }
 
 for i in ipairs(col_list) do
 	local col = col_list[i][1]
-	local code = col_list[i][2]
+	local name = col_list[i][2]
+	local code = col_list[i][3]
 
 	minetest.register_node("abri:dirt_with_"..col.."_grass", {
-		description = "Dirt with "..col.." Grass",
+		description = "Dirt with "..name.." Grass",
 		tiles = {"abri_grass_"..col..".png", "abri_dirt.png",
 			{name = "abri_dirt.png^abri_grass_side_"..col..".png",
 				tileable_vertical = false}},
@@ -37,5 +30,13 @@ for i in ipairs(col_list) do
 		-- 	footstep = {name = "default_grass_footstep", gain = 0.25},
 		-- }),
 	})
+
+	minetest.register_node("abri:stone_"..col, {
+		description = name.."Stone",
+		tiles = {"abri_stone.png^[colorize:#"..code..":60"},
+		groups = {cracky = 3, stone = 1},
+		drop = 'abri:stone_'..col, -- change to cobble?
+		-- sounds = default.node_sound_stone_defaults(),
+	})
 end