Dye mod: Remove 'basecolor', 'excolor', 'unicolor' groups

diff --git a/mods/dye/init.lua b/mods/dye/init.lua
index 8f26fed42b66723c859fdc1b50026f5159b29a85..f094dd2ff77478f01b4952fd41221dea3870dc5e 100644 (file)
--- a/mods/dye/init.lua
+++ b/mods/dye/init.lua
@@ -1,9 +1,4 @@
--- Other mods can use these for looping through available colors
-
 dye = {}
-dye.basecolors = {"white", "grey", "black", "red", "yellow", "green", "cyan", "blue", "magenta"}
-dye.excolors = {"white", "lightgrey", "grey", "darkgrey", "black", "red", "orange", "yellow",
-       "lime", "green", "aqua", "cyan", "sky_blue", "blue", "violet", "magenta", "red_violet"}
 
 -- Make dye names and descriptions available globally
 
@@ -25,47 +20,28 @@ dye.dyes = {
        {"pink",       "Pink"},
 }
 
--- This collection of colors is partly a historic thing, partly something else
-
-local dyes = {
-       {"white",      "White Dye",      {dye=1, basecolor_white=1,   excolor_white=1,      unicolor_white=1}},
-       {"grey",       "Grey Dye",       {dye=1, basecolor_grey=1,    excolor_grey=1,       unicolor_grey=1}},
-       {"dark_grey",  "Dark Grey Dye",  {dye=1, basecolor_grey=1,    excolor_darkgrey=1,   unicolor_darkgrey=1}},
-       {"black",      "Black Dye",      {dye=1, basecolor_black=1,   excolor_black=1,      unicolor_black=1}},
-       {"violet",     "Violet Dye",     {dye=1, basecolor_magenta=1, excolor_violet=1,     unicolor_violet=1}},
-       {"blue",       "Blue Dye",       {dye=1, basecolor_blue=1,    excolor_blue=1,       unicolor_blue=1}},
-       {"cyan",       "Cyan Dye",       {dye=1, basecolor_cyan=1,    excolor_cyan=1,       unicolor_cyan=1}},
-       {"dark_green", "Dark Green Dye", {dye=1, basecolor_green=1,   excolor_green=1,      unicolor_dark_green=1}},
-       {"green",      "Green Dye",      {dye=1, basecolor_green=1,   excolor_green=1,      unicolor_green=1}},
-       {"yellow",     "Yellow Dye",     {dye=1, basecolor_yellow=1,  excolor_yellow=1,     unicolor_yellow=1}},
-       {"brown",      "Brown Dye",      {dye=1, basecolor_brown=1,   excolor_orange=1,     unicolor_dark_orange=1}},
-       {"orange",     "Orange Dye",     {dye=1, basecolor_orange=1,  excolor_orange=1,     unicolor_orange=1}},
-       {"red",        "Red Dye",        {dye=1, basecolor_red=1,     excolor_red=1,        unicolor_red=1}},
-       {"magenta",    "Magenta Dye",    {dye=1, basecolor_magenta=1, excolor_red_violet=1, unicolor_red_violet=1}},
-       {"pink",       "Pink Dye",       {dye=1, basecolor_red=1,     excolor_red=1,        unicolor_light_red=1}},
-}
-
 -- Define items
 
-for _, row in ipairs(dyes) do
+for _, row in ipairs(dye.dyes) do
        local name = row[1]
        local description = row[2]
-       local groups = row[3]
-       local item_name = "dye:" .. name
-       local item_image = "dye_" .. name .. ".png"
-       minetest.register_craftitem(item_name, {
-               inventory_image = item_image,
-               description = description,
+       local groups = {dye = 1}
+       groups["color_" .. name] = 1
+
+       minetest.register_craftitem("dye:" .. name, {
+               inventory_image = "dye_" .. name .. ".png",
+               description = description .. " Dye",
                groups = groups
        })
+
        minetest.register_craft({
                type = "shapeless",
-               output = item_name .. " 4",
+               output = "dye:" .. name .. " 4",
                recipe = {"group:flower,color_" .. name},
        })
 end
 
--- Manually add coal->black dye
+-- Manually add coal -> black dye
 
 minetest.register_craft({
        type = "shapeless",
@@ -74,6 +50,7 @@ minetest.register_craft({
 })
 
 -- Mix recipes
+
 local dye_recipes = {
        -- src1, src2, dst
        -- RYB mixes