From 623728aee42bdfd7fb635c525214d60262fd293a Mon Sep 17 00:00:00 2001
From: Och Noe <och_noe@forksworld.de>
Date: Sat, 27 Jun 2020 21:34:34 +0200
Subject: additional colours for tinted glass

---
 crafting.lua |  62 +++++++++-
 nodes.lua    | 366 ++++++++++-------------------------------------------------
 2 files changed, 119 insertions(+), 309 deletions(-)

diff --git a/crafting.lua b/crafting.lua
index 90fd9cd..542cdb6 100644
--- a/crafting.lua
+++ b/crafting.lua
@@ -652,9 +652,50 @@ if minetest.settings:get_bool("moreblocks.circular_saw_crafting") ~= false then
 end
 
 
+local tinted_glass_colour_list =
+   {
+   "blue", "cyan", "green", "grey", 
+   "magenta", "red", "white", "yellow", 
+   "brown", "orange", "pink", "violet", 
+   "dark_green", "dark_grey",
+}
+
+local tinted_dark_glass_colour_list =
+   {
+   "dark_blue", "dark_brown", "dark_cyan", 
+   "dark_magenta", "dark_orange", 
+   "dark_pink", "dark_red", "dark_violet", "dark_yellow", 
+}
+
+
+
+for _,c in pairs(tinted_glass_colour_list) do
+   minetest.register_craft({
+       type = "shapeless",
+       output = "moreblocks:"..c.."_tinted_glass 8",
+       recipe = {"default:glass", "default:glass", "default:glass", 
+	  "default:glass", "dye:"..c, "default:glass", 
+	  "default:glass", "default:glass", "default:glass"}
+    })
+
+end
+
+for _,c in pairs(tinted_dark_glass_colour_list) do
+   minetest.register_craft({
+       type = "shapeless",
+       output = "moreblocks:"..c.."_tinted_glass 7",
+       recipe = {"default:glass", "default:glass", "default:glass", 
+	  "default:glass", "dye:"..c, "default:glass", 
+	  "default:glass", "dye:black", "default:glass"}
+    })
+
+end
+
+--[[
+
 minetest.register_craft({
    type = "shapeless",
-        output = "moreblocks:blue_tinted_glass 8",
+	output = "moreblocks:blue_tinted_glass 8",
         recipe = {"default:glass", "default:glass", "default:glass", 
            "default:glass", "dye:blue", "default:glass", 
            "default:glass", "default:glass", "default:glass"}
@@ -718,6 +759,25 @@ minetest.register_craft({
 })
 
 
+--]]
+
+-- "brown_tinted_glass"
+-- "dark_blue_tinted_glass"
+-- "dark_brown_tinted_glass"
+-- "dark_cyan_tinted_glass"
+-- "dark_green_tinted_glass"
+-- "dark_grey_tinted_glass"
+-- "dark_magenta_tinted_glass"
+-- "dark_orange_tinted_glass"
+-- "dark_pink_tinted_glass"
+-- "dark_red_tinted_glass"
+-- "dark_violet_tinted_glass"
+-- "dark_yellow_tinted_glass"
+-- "orange_tinted_glass"
+-- "pink_tinted_glass"
+-- "violet_tinted_glass"
+
+
 minetest.register_craft({
                            output = "moreblocks:gravel_stonebrick 2",
                            recipe = {
diff --git a/nodes.lua b/nodes.lua
index 33cc1f4..f4c97da 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -630,314 +630,6 @@ local nodes = {
 		groups = {cracky = 1, level = 2},
 		sounds = sound_metal,
 	},
-	["blue_tinted_glass"] = {
-		description = S("Blue Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_blue1.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                -- no_stairs = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["cyan_tinted_glass"] = {
-		description = S("Cyan Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_cyan1.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                -- no_stairs = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["green_tinted_glass"] = {
-		description = S("Green Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_green1.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                -- no_stairs = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["grey_tinted_glass"] = {
-		description = S("Grey Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_grey1.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                -- no_stairs = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["red_tinted_glass"] = {
-		description = S("Red Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_red1.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                -- no_stairs = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["magenta_tinted_glass"] = {
-		description = S("Magenta Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_magenta1.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                -- no_stairs = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["white_tinted_glass"] = {
-		description = S("White Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_white1.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                -- no_stairs = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-	["yellow_tinted_glass"] = {
-		description = S("Yellow Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_yellow1.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                -- no_stairs = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["brown_tinted_glass"] = {
-		description = S("Brown Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_brown2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_blue_tinted_glass"] = {
-		description = S("Dark Blue Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_blue2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_brown_tinted_glass"] = {
-		description = S("Dark Brown Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_brown2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_cyan_tinted_glass"] = {
-		description = S("Dark Cyan Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_cyan2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_green_tinted_glass"] = {
-		description = S("Dark Green Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_green2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_grey_tinted_glass"] = {
-		description = S("Dark Grey Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_grey2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_magenta_tinted_glass"] = {
-		description = S("Dark Magenta Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_magenta2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_orange_tinted_glass"] = {
-		description = S("Dark Orange Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_orange2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_pink_tinted_glass"] = {
-		description = S("Dark Pink Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_pink2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_red_tinted_glass"] = {
-		description = S("Dark Red Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_red2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_violet_tinted_glass"] = {
-		description = S("Dark Violet Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_violet2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["dark_yellow_tinted_glass"] = {
-		description = S("Dark Yellow Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_dark_yellow2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["orange_tinted_glass"] = {
-		description = S("Orange Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_orange2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["pink_tinted_glass"] = {
-		description = S("Pink Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_pink2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-	["violet_tinted_glass"] = {
-		description = S("Violet Tinted Glass"),
-		drawtype = "glasslike_framed_optional",
-                tiles = {"moreblocks_violet2.png^moreblocks_clean_glass.png"},
-                one_texture = true,
-                use_texture_alpha = true,
-		paramtype = "light",
-                no_stairs = true,
-		minimal_shapes = true,
-		sunlight_propagates = true,
-		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
-		sounds = sound_glass,
-	},
-
-
 
 	["gravel_stonebrick"] = {
            description = S("Gravel on Stonebrick"),
@@ -1070,6 +762,64 @@ local nodes = {
 
 }
 
+
+
+---------------
+
+local tinted_glass_1 = 
+   { 
+   -- tinted glass from dyes
+   { "blue", "Blue", "blue1" },
+   { "cyan", "Cyan", "cyan1" },
+   { "green", "Green", "green1" },
+   { "grey", "Grey", "grey1" },
+   { "red", "Red", "red1" },
+   { "magenta", "Magenta", "magenta1" },
+   { "white", "White", "white1" },
+   { "yellow", "Yellow", "yellow1" },
+   { "brown", "Brown", "brown2" },
+   { "dark_green", "Dark Green", "dark_green2" },
+   { "dark_grey", "Dark Grey", "dark_grey2" },
+   { "orange", "Orange", "orange2" },
+   { "pink", "Pink", "pink2" },
+   { "violet", "Violet", "violet2" },
+   -- tinted glass from dyes + black
+   { "dark_magenta" , "Dark Magenta", "dark_magenta2" },
+   { "dark_orange" , "Dark Orange", "dark_orange2" },
+   { "dark_pink" , "Dark Pink", "dark_pink2" },
+   { "dark_red" , "Dark Red", "dark_red2" },
+   { "dark_violet" , "Dark Violet", "dark_violet2" },
+   { "dark_yellow" , "Dark Yellow", "dark_yellow2" },
+}
+	
+
+for _,f in pairs(tinted_glass_1) do
+   iname = f[1].."_tinted_glass"
+   desc = S(f[2].." Tinted Glass") 
+   t_name = {"moreblocks_"..f[3]..".png^moreblocks_clean_glass.png"}
+   neu = {}
+   neu.description = desc
+   neu.drawtype = "glasslike_framed_optional"
+   neu.tiles = t_name
+   neu.one_texture = true
+   neu.use_texture_alpha = true
+   neu.paramtype = "light"
+   neu.sunlight_propagates = true
+   neu.groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3}
+   neu.sounds = sound_glass
+   nodes[iname] = neu
+end
+
+
+
+
+---------------
+
+
+
+
+
+
 if minetest.get_modpath("ethereal") then
     nodes["all_faces_mushroom_tree"] =  {
                 description = S("All-faces Mushroom Tree"),
-- 
cgit v1.2.3