diff options
81 files changed, 218 insertions, 455 deletions
diff --git a/changelog.txt b/changelog.txt index 143911e..f556fb9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,71 +1,101 @@ Changelog --------- -2012-07-26: Added a "version" check for the flowers dependency: If the -flowers mod defines "flowers:flower_geranium" (as is the case with my update -of 2012-08-01), then those will be used to get blue pigment powder, and violas -will produce violet powder, both of which can be directly used to create their -respective liquid dye colors. If it is not defined (e.g. the user has an -older version of the flowers mod), then violas produce blue dye powder. Violet -dye can still be formed by mixing blue and magenta or blue and red dyes, as -before. +2013-04-30: Multiple changes -2012-07-26: Better bottle textures. Note that these are blended against the -50% grey field they normally appear on in the inventory display, so they will -show artifacts if you try to wield them. Don't do that. :-) +* Refactored the code to use default "common" dyes +rather than directly from flowers. -2012-07-26: Split off glass bottles into a separate mod, "Vessels". This mod -now depends on it. +* This mod now depends on "default" and "dye" from the Minetest common +sub-game. Since the default dye mod uses default flowers, this mod no +longer checks for what version of flowers you're using, or even depends +on it. -2012-07-25 (almost immediately after): Fixed a copy&paste error for black dye. +* Bottle-based textures have been replaced with piles of dye powder, based +on the default red dye texture. -2012-07-25: Replaced missing craftitem entries and got rid of some redundant -code left over from last update. Added group settings for all dyes according -to recently-published standard. Fixed a few typos in item descriptions, and -straightened up capitalization. +* All dyes are obtained by crafting, not cooking, for consistency with the +default dye mod. + +* The somewhat-complicated method using separate "pigment" powders, glass +bottles and "liquid dye base" has been done away with. Now it's just +dry dye powders, as with the default dye mod. + +* Also, got rid of the whole paint scheme, in favor of dry powders. + +* All old dyes, paints, and Unified Dyes pigment powders have been aliased +back to the standard dye powders. + +2012-07-26: Added a "version" check for the flowers dependency: If the +flowers mod defines "flowers:flower_geranium" (as is the case with my +update of 2012-08-01), then those will be used to get blue pigment +powder, and violas will produce violet powder, both of which can be +directly used to create their respective liquid dye colors. If it is +not defined (e.g. the user has an older version of the flowers mod), +then violas produce blue dye powder. Violet dye can still be formed by +mixing blue and magenta or blue and red dyes, as before. + +2012-07-26: Better bottle textures. Note that these are blended against +the 50% grey field they normally appear on in the inventory display, so +they will show artifacts if you try to wield them. Don't do that. :-) + +2012-07-26: Split off glass bottles into a separate mod, "Vessels". +This mod now depends on it. + +2012-07-25 (almost immediately after): Fixed a copy&paste error for +black dye. + +2012-07-25: Replaced missing craftitem entries and got rid of some +redundant code left over from last update. Added group settings for all +dyes according to recently-published standard. Fixed a few typos in +item descriptions, and straightened up capitalization. 2012-07-24: Added some extra steps to the dye-making process, added -recommendation that empty bottles be given back to the player on use. Dyes -are still easy to make, they just require a more realistic (and this, harder) -process now. +recommendation that empty bottles be given back to the player on use. +Dyes are still easy to make, they just require a more realistic (and +this, harder) process now. -2012-07-16 (a bit later): fixed a minor error in generation of medium grey. +2012-07-16 (a bit later): fixed a minor error in generation of medium +grey. -2012-07-16: Added a new set of colors, "light" (brightness of 150% versus the -'full' shade), for a total of 89. No 50% saturation version of this set. -Added a palette image showing the full set of colors. +2012-07-16: Added a new set of colors, "light" (brightness of 150% +versus the 'full' shade), for a total of 89. No 50% saturation version +of this set. Added a palette image showing the full set of colors. -2012-07-13: Fixed some missing commas. +2012-07-13: Fixed some missing commas. -2012-07-13: Added a script to aid in the generation of new textures for mods -that depend on unifieddyes. Moved this changelog from the forum into the -distribution directory. Rewrote the README to contain everything from the -forum post, and expanded it to document the new generation script. +2012-07-13: Added a script to aid in the generation of new textures for +mods that depend on unifieddyes. Moved this changelog from the forum +into the distribution directory. Rewrote the README to contain +everything from the forum post, and expanded it to document the new +generation script. -2012-07-12 (a bit later): added groups = {dye=1}, to each register_craftitem -call, to make it easier for other mods to identify the dyes and categorize -them. +2012-07-12 (a bit later): added groups = {dye=1}, to each +register_craftitem call, to make it easier for other mods to identify +the dyes and categorize them. 2012-07-12: moved project to github. -2012-07-11 (continuing): Tweaked the script to remove titanium dioxide from the -output, since it isn't intended to be directly used as a dye/paint (but rather, -to make paint that can then be used). Regenerated colors.txt. +2012-07-11 (continuing): Tweaked the script to remove titanium dioxide +from the output, since it isn't intended to be directly used as a +dye/paint (but rather, to make paint that can then be used). +Regenerated colors.txt. -2012-07-11 (immediately after): The script was reading the wrong pixel from the -image, resulting in lighter-than-correct colors. Fixed it and regenerated the -colors.txt file. +2012-07-11 (immediately after): The script was reading the wrong pixel +from the image, resulting in lighter-than-correct colors. Fixed it and +regenerated the colors.txt file. -2012-07-11: Added a script to list all of the colors and their RGB values and -texture filenames, and a text file containing the output thereof. +2012-07-11: Added a script to list all of the colors and their RGB +values and texture filenames, and a text file containing the output +thereof. 2012-07-08 (a bit later): deleted a few unused files (copy&paste error). -2012-07-08: Major boost in the number of available colors - was 8, now 77. -Should cover pretty much the entire spectrum of colors one might use in this -game. +2012-07-08: Major boost in the number of available colors - was 8, now +77. Should cover pretty much the entire spectrum of colors one might +use in this game. -2012-07-02: Deleted a few redundant files (leftovers from when I wanted to -merge in flowers and then changed my mind). +2012-07-02: Deleted a few redundant files (leftovers from when I wanted +to merge in flowers and then changed my mind). 2012-06-26: Initial upload. diff --git a/depends.txt b/depends.txt index 0c34fc8..2717bef 100644 --- a/depends.txt +++ b/depends.txt @@ -1,4 +1,2 @@ default -flowers -vessels -bucket +dye @@ -2,7 +2,7 @@ Unified Dyes -This mod provides a complete dye system and framework for Minetest 0.4.x. +This mod provides an extension to the Minetest 0.4.x dye system ============================================================================== @@ -25,440 +25,145 @@ with this program; if not, write to the Free Software Foundation, Inc., ============================================================================== -First, craft some bottles from the Vessels mod, then make some dye base: -Craft six empty bottles along with a bucket of water and a piece -of jungle grass to get 6 portions of dye base. +--]] -These craft/craftitem definitions for glass bottles are deprecated and are -only included here for backwards compatibility. Use vessels:glass_bottle -instead. -]]-- +--===================================================================== +-- Items/recipes needed to generate the few base colors that are not +-- provided by the standard dyes mod. -minetest.register_craftitem("unifieddyes:empty_bottle", { - description = "Glass Bottle (empty) (Deprecated)", - inventory_image = "unifieddyes_empty_bottle.png", -}) - -minetest.register_craft( { - type = "shapeless", - output = "vessels:glass_fragments", - recipe = { - "unifieddyes:empty_bottle", - "unifieddyes:empty_bottle", - }, -}) - --- Now the current stuff, using vessels:glass_bottle. - -minetest.register_craftitem("unifieddyes:dye_base", { - description = "Uncolored Dye Base Liquid", - inventory_image = "unifieddyes_dye_base.png", -}) - -minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:dye_base 6", - recipe = { - "vessels:glass_bottle", - "vessels:glass_bottle", - "vessels:glass_bottle", - "vessels:glass_bottle", - "vessels:glass_bottle", - "vessels:glass_bottle", - "bucket:bucket_water", - "default:junglegrass", - }, - replacements = { {'bucket:bucket_water', 'bucket:bucket_empty'}, }, -}) - ---========================================================================== --- Now we need to turn our color sources (flowers, etc) into pigments and from --- there into actual usable dyes. There are seven base colors - one for each --- flower, plus black (as "carbon black") from coal, and white (as "titanium --- dioxide") from stone. Most give two portions of pigment; cactus gives 6, --- stone gives 10. - -pigments = { - "red", - "orange", - "yellow", - "green" -} - -dyesdesc = { - "Red", - "Orange", - "Yellow", - "Green" -} - -colorsources = { - "flowers:flower_rose", - "flowers:flower_tulip", - "flowers:flower_dandelion_yellow", - "flowers:flower_waterlily", -} - -for color in ipairs(colorsources) do - - -- the recipes to turn sources into pigments - - minetest.register_craftitem("unifieddyes:pigment_"..pigments[color], { - description = dyesdesc[color].." Pigment", - inventory_image = "unifieddyes_pigment_"..pigments[color]..".png", - }) - - minetest.register_craft({ - type = "cooking", - output = "unifieddyes:pigment_"..pigments[color].." 2", - recipe = colorsources[color], - }) - - -- The recipes to turn pigments into usable dyes - - minetest.register_craftitem("unifieddyes:"..pigments[color], { - description = "Full "..dyesdesc[color].." Dye", - inventory_image = "unifieddyes_"..pigments[color]..".png", - groups = { dye=1, ["basecolor_"..pigments[color]]=1, ["excolor_"..pigments[color]]=1, ["unicolor_"..pigments[color]]=1 } - }) - - minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:"..pigments[color], - recipe = { - "unifieddyes:pigment_"..pigments[color], - "unifieddyes:dye_base" - } - }) -end - --- Stone->titanium dioxide and cactus->green pigment are done separately --- because of their larger yields - -minetest.register_craftitem("unifieddyes:titanium_dioxide", { - description = "Titanium Dioxide", - inventory_image = "unifieddyes_titanium_dioxide.png", -}) - -minetest.register_craft({ - type = "cooking", - output = "unifieddyes:titanium_dioxide 10", - recipe = "default:stone", -}) - -minetest.register_craft({ - type = "cooking", - output = "unifieddyes:pigment_green 6", - recipe = "default:cactus", -}) - --- coal->carbon black and carbon black -> black dye are done separately --- because of the different names - -minetest.register_craftitem("unifieddyes:carbon_black", { - description = "Carbon Black", - inventory_image = "unifieddyes_carbon_black.png", -}) - -minetest.register_craft({ - type = "cooking", - output = "unifieddyes:carbon_black 2", - recipe = "default:coal_lump", -}) - -minetest.register_craftitem("unifieddyes:black", { - description = "Black Dye", - inventory_image = "unifieddyes_black.png", - groups = { dye=1, basecolor_black=1, excolor_black=1, unicolor_black=1 } -}) - -minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:black", - recipe = { - "unifieddyes:carbon_black", - "unifieddyes:dye_base", - }, -}) - ---======================================================================= --- Now that we have the dyes in a usable form, let's mix the various --- ingredients together to create the rest of the mod's colors and greys. - - ----------------------------- --- The 5 levels of greyscale - --- White paint - -minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:white_paint", - recipe = { - "unifieddyes:titanium_dioxide", - "bucket:bucket_water", - "default:junglegrass", - }, -}) +-- Lime -minetest.register_craftitem("unifieddyes:white_paint", { - description = "White Paint", - inventory_image = "unifieddyes_white_paint.png", - groups = { dye=1, basecolor_white=1, excolor_white=1, unicolor_white=1 } +minetest.register_craftitem(":dye:lime", { + description = "Lime Dye", + inventory_image = "unifieddyes_lime.png", + groups = { dye=1, excolor_lime=1, unicolor_lime=1 } }) --- Light grey paint - minetest.register_craft( { type = "shapeless", - output = "unifieddyes:lightgrey_paint 3", + output = "dye:lime 2", recipe = { - "unifieddyes:white_paint", - "unifieddyes:white_paint", - "unifieddyes:carbon_black", + "dye:yellow", + "dye:green", }, }) -minetest.register_craftitem("unifieddyes:lightgrey_paint", { - description = "Light Grey Paint", - inventory_image = "unifieddyes_lightgrey_paint.png", - groups = { dye=1, excolor_lightgrey=1, unicolor_lightgrey=1 } -}) - --- Medium grey paint - -minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:grey_paint 2", - recipe = { - "unifieddyes:white_paint", - "unifieddyes:carbon_black", - }, -}) +-- Aqua -minetest.register_craftitem("unifieddyes:grey_paint", { - description = "Medium Grey Paint", - inventory_image = "unifieddyes_grey_paint.png", - groups = { dye=1, basecolor_grey=1, excolor_grey=1, unicolor_grey=1 } +minetest.register_craftitem(":dye:aqua", { + description = "Aqua Dye", + inventory_image = "unifieddyes_aqua.png", + groups = { dye=1, excolor_aqua=1, unicolor_aqua=1 } }) --- Dark grey paint - minetest.register_craft( { type = "shapeless", - output = "unifieddyes:darkgrey_paint 3", + output = "dye:aqua 2", recipe = { - "unifieddyes:white_paint", - "unifieddyes:carbon_black", - "unifieddyes:carbon_black", + "dye:cyan", + "dye:green", }, }) -minetest.register_craftitem("unifieddyes:darkgrey_paint", { - description = "Dark Grey Paint", - inventory_image = "unifieddyes_darkgrey_paint.png", - groups = { dye=1, excolor_darkgrey=1, unicolor_darkgrey=1 } -}) - - ---============================================================================= --- Smelting/crafting recipes needed to generate various remaining 'full' colors --- (the register_craftitem functions are in the generate-the-rest loop below). - --- Cyan +-- Sky blue -minetest.register_craftitem("unifieddyes:cyan", { - description = "Full Cyan Dye", - inventory_image = "unifieddyes_cyan.png", - groups = { dye=1, basecolor_cyan=1, excolor_cyan=1, unicolor_cyan=1 } +minetest.register_craftitem(":dye:skyblue", { + description = "Sky-blue Dye", + inventory_image = "unifieddyes_skyblue.png", + groups = { dye=1, excolor_sky_blue=1, unicolor_sky_blue=1 } }) minetest.register_craft( { type = "shapeless", - output = "unifieddyes:cyan 2", + output = "dye:skyblue 2", recipe = { - "unifieddyes:blue", - "unifieddyes:green", + "dye:cyan", + "dye:blue", }, }) --- Magenta +-- Red-violet -minetest.register_craftitem("unifieddyes:magenta", { - description = "Full Magenta Dye", - inventory_image = "unifieddyes_magenta.png", - groups = { dye=1, basecolor_magenta=1, excolor_magenta=1, unicolor_magenta=1 } +minetest.register_craftitem(":dye:redviolet", { + description = "Red-violet Dye", + inventory_image = "unifieddyes_redviolet.png", + groups = { dye=1, excolor_red_violet=1, unicolor_red_violet=1 } }) minetest.register_craft( { type = "shapeless", - output = "unifieddyes:magenta 2", + output = "dye:redviolet 2", recipe = { - "unifieddyes:blue", - "unifieddyes:red", + "dye:red", + "dye:magenta", }, }) --- Lime -minetest.register_craftitem("unifieddyes:lime", { - description = "Full Lime Dye", - inventory_image = "unifieddyes_lime.png", - groups = { dye=1, excolor_lime=1, unicolor_lime=1 } -}) - -minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:lime 2", - recipe = { - "unifieddyes:yellow", - "unifieddyes:green", - }, -}) - --- Aqua +-- Light grey -minetest.register_craftitem("unifieddyes:aqua", { - description = "Full Aqua Dye", - inventory_image = "unifieddyes_aqua.png", - groups = { dye=1, excolor_aqua=1, unicolor_aqua=1 } +minetest.register_craftitem(":dye:light_grey", { + description = "Light Grey Dye", + inventory_image = "unifieddyes_lightgrey.png", + groups = { dye=1, excolor_red_violet=1, unicolor_red_violet=1 } }) minetest.register_craft( { type = "shapeless", - output = "unifieddyes:aqua 2", + output = "dye:light_grey 2", recipe = { - "unifieddyes:cyan", - "unifieddyes:green", + "dye:grey", + "dye:white", }, }) --- Sky blue - -minetest.register_craftitem("unifieddyes:skyblue", { - description = "Full Sky-blue Dye", - inventory_image = "unifieddyes_skyblue.png", - groups = { dye=1, excolor_sky_blue=1, unicolor_sky_blue=1 } -}) +-- Extra craft for black dye minetest.register_craft( { type = "shapeless", - output = "unifieddyes:skyblue 2", + output = "dye:black 4", recipe = { - "unifieddyes:cyan", - "unifieddyes:blue", + "default:coal_lump", }, }) --- Red-violet - -minetest.register_craftitem("unifieddyes:redviolet", { - description = "Full Red-violet Dye", - inventory_image = "unifieddyes_redviolet.png", - groups = { dye=1, excolor_red_violet=1, unicolor_red_violet=1 } -}) +-- Extra craft for dark grey dye minetest.register_craft( { type = "shapeless", - output = "unifieddyes:redviolet 2", + output = "dye:dark_grey 3", recipe = { - "unifieddyes:red", - "unifieddyes:magenta", + "dye:black", + "dye:black", + "dye:white", }, }) --- We need to check if the version of the Flowers mod that is installed --- contains geraniums or not. If it doesn't, use the Viola to make blue dye. --- If Geraniums do exist, use them to make blue dye instead, and use Violas --- to get violet dye. Violet can always be made by mixing blue with magenta --- or red as usual. - - -minetest.register_craftitem("unifieddyes:pigment_blue", { - description = "Blue Pigment", - inventory_image = "unifieddyes_pigment_blue.png", -}) - -minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:blue", - recipe = { - "unifieddyes:pigment_blue", - "unifieddyes:dye_base" - } -}) - -minetest.register_craftitem("unifieddyes:blue", { - description = "Full Blue Dye", - inventory_image = "unifieddyes_blue.png", - groups = { dye=1, basecolor_blue=1, excolor_blue=1, unicolor_blue=1 } -}) - -minetest.register_craftitem("unifieddyes:violet", { - description = "Full Violet/Purple Dye", - inventory_image = "unifieddyes_violet.png", - groups = { dye=1, basecolor_violet=1, excolor_violet=1, unicolor_violet=1 } -}) +-- Extra craft for light grey dye minetest.register_craft( { type = "shapeless", - output = "unifieddyes:violet 2", + output = "dye:light_grey 3", recipe = { - "unifieddyes:blue", - "unifieddyes:magenta", + "dye:black", + "dye:white", + "dye:white", }, }) +-- Extra craft for green dye + minetest.register_craft( { type = "shapeless", - output = "unifieddyes:violet 3", + output = "dye:green 4", recipe = { - "unifieddyes:blue", - "unifieddyes:blue", - "unifieddyes:red", + "default:cactus", }, }) -if minetest.registered_nodes["flowers:flower_geranium"] == nil then - - - minetest.register_craft({ - type = "cooking", - output = "unifieddyes:pigment_blue 2", - recipe = "flowers:flower_viola", - }) -else - minetest.register_craftitem("unifieddyes:pigment_violet", { - description = "Violet Pigment", - inventory_image = "unifieddyes_pigment_violet.png", - }) - - minetest.register_craft({ - type = "cooking", - output = "unifieddyes:pigment_blue 2", - recipe = "flowers:flower_geranium", - }) - - minetest.register_craft({ - type = "cooking", - output = "unifieddyes:pigment_violet 2", - recipe = "flowers:flower_viola", - }) - - minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:violet", - recipe = { - "unifieddyes:pigment_violet", - "unifieddyes:dye_base" - } - }) -end - - -- ================================================================= --- Finally, generate all of additional variants of hue, saturation, and +-- Generate all of additional variants of hue, saturation, and -- brightness. -- "s50" in a file/item name means "saturation: 50%". @@ -505,8 +210,8 @@ for i = 1, 12 do type = "shapeless", output = "unifieddyes:dark_" .. hue .. "_s50 2", recipe = { - "unifieddyes:" .. hue, - "unifieddyes:darkgrey_paint", + "dye:" .. hue, + "dye:dark_grey", }, }) @@ -514,29 +219,42 @@ for i = 1, 12 do type = "shapeless", output = "unifieddyes:dark_" .. hue .. "_s50 4", recipe = { - "unifieddyes:" .. hue, - "unifieddyes:black", - "unifieddyes:black", - "unifieddyes:white_paint" + "dye:" .. hue, + "dye:black", + "dye:black", + "dye:white" }, }) - minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:dark_" .. hue .. " 3", - recipe = { - "unifieddyes:" .. hue, - "unifieddyes:black", - "unifieddyes:black", - }, - }) + if hue == "green" then + + minetest.register_craft( { + type = "shapeless", + output = "dye:dark_green 3", + recipe = { + "dye:" .. hue, + "dye:black", + "dye:black", + }, + }) + else + minetest.register_craft( { + type = "shapeless", + output = "unifieddyes:dark_" .. hue .. " 3", + recipe = { + "dye:" .. hue, + "dye:black", + "dye:black", + }, + }) + end minetest.register_craft( { type = "shapeless", output = "unifieddyes:medium_" .. hue .. "_s50 2", recipe = { - "unifieddyes:" .. hue, - "unifieddyes:grey_paint", + "dye:" .. hue, + "dye:grey", }, }) @@ -544,9 +262,9 @@ for i = 1, 12 do type = "shapeless", output = "unifieddyes:medium_" .. hue .. "_s50 3", recipe = { - "unifieddyes:" .. hue, - "unifieddyes:black", - "unifieddyes:white_paint", + "dye:" .. hue, + "dye:black", + "dye:white", }, }) @@ -554,8 +272,8 @@ for i = 1, 12 do type = "shapeless", output = "unifieddyes:medium_" .. hue .. " 2", recipe = { - "unifieddyes:" .. hue, - "unifieddyes:black", + "dye:" .. hue, + "dye:black", }, }) @@ -563,8 +281,9 @@ for i = 1, 12 do type = "shapeless", output = "unifieddyes:" .. hue .. "_s50 2", recipe = { - "unifieddyes:" .. hue, - "unifieddyes:lightgrey_paint", + "dye:" .. hue, + "dye:grey", + "dye:white", }, }) @@ -572,22 +291,23 @@ for i = 1, 12 do type = "shapeless", output = "unifieddyes:" .. hue .. "_s50 4", recipe = { - "unifieddyes:" .. hue, - "unifieddyes:white_paint", - "unifieddyes:white_paint", - "unifieddyes:black", + "dye:" .. hue, + "dye:white", + "dye:white", + "dye:black", }, }) - minetest.register_craft( { - type = "shapeless", - output = "unifieddyes:light_" .. hue .. " 2", - recipe = { - "unifieddyes:" .. hue, - "unifieddyes:white_paint", - }, - replacements = { {'unifieddyes:white_paint', 'bucket:bucket_empty'}, }, - }) + if hue ~= "red" then + minetest.register_craft( { + type = "shapeless", + output = "unifieddyes:light_" .. hue .. " 2", + recipe = { + "dye:" .. hue, + "dye:white", + }, + }) + end minetest.register_craftitem("unifieddyes:dark_" .. hue .. "_s50", { description = "Dark " .. hue2 .. " Dye (low saturation)", @@ -595,11 +315,13 @@ for i = 1, 12 do groups = { dye=1, ["unicolor_dark_"..hue.."_s50"]=1 } }) - minetest.register_craftitem("unifieddyes:dark_" .. hue, { - description = "Dark " .. hue2 .. " Dye", - inventory_image = "unifieddyes_dark_" .. hue .. ".png", - groups = { dye=1, ["unicolor_dark_"..hue]=1 } - }) + if hue ~= "green" then + minetest.register_craftitem("unifieddyes:dark_" .. hue, { + description = "Dark " .. hue2 .. " Dye", + inventory_image = "unifieddyes_dark_" .. hue .. ".png", + groups = { dye=1, ["unicolor_dark_"..hue]=1 } + }) + end minetest.register_craftitem("unifieddyes:medium_" .. hue .. "_s50", { description = "Medium " .. hue2 .. " Dye (low saturation)", @@ -619,13 +341,26 @@ for i = 1, 12 do groups = { dye=1, ["unicolor_"..hue.."_s50"]=1 } }) - minetest.register_craftitem("unifieddyes:light_" .. hue, { - description = "Light " .. hue2 .. " Dye", - inventory_image = "unifieddyes_light_" .. hue .. ".png", - groups = { dye=1, ["unicolor_light_"..hue]=1 } - }) - + if hue ~= "red" then + minetest.register_craftitem("unifieddyes:light_" .. hue, { + description = "Light " .. hue2 .. " Dye", + inventory_image = "unifieddyes_light_" .. hue .. ".png", + groups = { dye=1, ["unicolor_light_"..hue]=1 } + }) + end + minetest.register_alias("unifieddyes:"..hue, "dye:"..hue) + minetest.register_alias("unifieddyes:pigment_"..hue, "dye:"..hue) end +minetest.register_alias("unifieddyes:light_red", "dye:pink") +minetest.register_alias("unifieddyes:dark_green", "dye:dark_green") + +minetest.register_alias("unifieddyes:white_paint", "dye:white") +minetest.register_alias("unifieddyes:titanium_dioxide", "dye:white") +minetest.register_alias("unifieddyes:lightgrey_paint", "dye:light_grey") +minetest.register_alias("unifieddyes:grey_paint", "dye:grey") +minetest.register_alias("unifieddyes:darkgrey_paint", "dye:dark_grey") +minetest.register_alias("unifieddyes:carbon_black", "dye:black") + print("[UnifiedDyes] Loaded!") diff --git a/textures/unifieddyes_aqua.png b/textures/unifieddyes_aqua.png Binary files differindex 8fbd722..9e18ac5 100644 --- a/textures/unifieddyes_aqua.png +++ b/textures/unifieddyes_aqua.png diff --git a/textures/unifieddyes_aqua_s50.png b/textures/unifieddyes_aqua_s50.png Binary files differindex e3018e6..aa42eba 100644 --- a/textures/unifieddyes_aqua_s50.png +++ b/textures/unifieddyes_aqua_s50.png diff --git a/textures/unifieddyes_blue_s50.png b/textures/unifieddyes_blue_s50.png Binary files differindex 9486507..09ac521 100644 --- a/textures/unifieddyes_blue_s50.png +++ b/textures/unifieddyes_blue_s50.png diff --git a/textures/unifieddyes_cyan_s50.png b/textures/unifieddyes_cyan_s50.png Binary files differindex c686958..c45eba1 100644 --- a/textures/unifieddyes_cyan_s50.png +++ b/textures/unifieddyes_cyan_s50.png diff --git a/textures/unifieddyes_dark_aqua.png b/textures/unifieddyes_dark_aqua.png Binary files differindex 68b9271..4f8d4bd 100644 --- a/textures/unifieddyes_dark_aqua.png +++ b/textures/unifieddyes_dark_aqua.png diff --git a/textures/unifieddyes_dark_aqua_s50.png b/textures/unifieddyes_dark_aqua_s50.png Binary files differindex 319b3ef..adea0b0 100644 --- a/textures/unifieddyes_dark_aqua_s50.png +++ b/textures/unifieddyes_dark_aqua_s50.png diff --git a/textures/unifieddyes_dark_blue.png b/textures/unifieddyes_dark_blue.png Binary files differindex 1b44a43..4349d18 100644 --- a/textures/unifieddyes_dark_blue.png +++ b/textures/unifieddyes_dark_blue.png diff --git a/textures/unifieddyes_dark_blue_s50.png b/textures/unifieddyes_dark_blue_s50.png Binary files differindex 63ec8b8..21873e4 100644 --- a/textures/unifieddyes_dark_blue_s50.png +++ b/textures/unifieddyes_dark_blue_s50.png diff --git a/textures/unifieddyes_dark_cyan.png b/textures/unifieddyes_dark_cyan.png Binary files differindex 0d5139d..25146cc 100644 --- a/textures/unifieddyes_dark_cyan.png +++ b/textures/unifieddyes_dark_cyan.png diff --git a/textures/unifieddyes_dark_cyan_s50.png b/textures/unifieddyes_dark_cyan_s50.png Binary files differindex 5f09629..c2b9471 100644 --- a/textures/unifieddyes_dark_cyan_s50.png +++ b/textures/unifieddyes_dark_cyan_s50.png diff --git a/textures/unifieddyes_dark_green.png b/textures/unifieddyes_dark_green.png Binary files differindex 2c4d8d1..4b51ee0 100644 --- a/textures/unifieddyes_dark_green.png +++ b/textures/unifieddyes_dark_green.png diff --git a/textures/unifieddyes_dark_green_s50.png b/textures/unifieddyes_dark_green_s50.png Binary files differindex 2cc4a04..9bc76ff 100644 --- a/textures/unifieddyes_dark_green_s50.png +++ b/textures/unifieddyes_dark_green_s50.png diff --git a/textures/unifieddyes_dark_lime.png b/textures/unifieddyes_dark_lime.png Binary files differindex 97f8fae..ea007cb 100644 --- a/textures/unifieddyes_dark_lime.png +++ b/textures/unifieddyes_dark_lime.png diff --git a/textures/unifieddyes_dark_lime_s50.png b/textures/unifieddyes_dark_lime_s50.png Binary files differindex ed05323..0470c51 100644 --- a/textures/unifieddyes_dark_lime_s50.png +++ b/textures/unifieddyes_dark_lime_s50.png diff --git a/textures/unifieddyes_dark_magenta.png b/textures/unifieddyes_dark_magenta.png Binary files differindex f822405..69c537e 100644 --- a/textures/unifieddyes_dark_magenta.png +++ b/textures/unifieddyes_dark_magenta.png diff --git a/textures/unifieddyes_dark_magenta_s50.png b/textures/unifieddyes_dark_magenta_s50.png Binary files differindex 57224fa..0ccacbc 100644 --- a/textures/unifieddyes_dark_magenta_s50.png +++ b/textures/unifieddyes_dark_magenta_s50.png diff --git a/textures/unifieddyes_dark_orange.png b/textures/unifieddyes_dark_orange.png Binary files differindex fad0d24..ba3ac22 100644 --- a/textures/unifieddyes_dark_orange.png +++ b/textures/unifieddyes_dark_orange.png diff --git a/textures/unifieddyes_dark_orange_s50.png b/textures/unifieddyes_dark_orange_s50.png Binary files differindex 106933c..887089e 100644 --- a/textures/unifieddyes_dark_orange_s50.png +++ b/textures/unifieddyes_dark_orange_s50.png diff --git a/textures/unifieddyes_dark_red.png b/textures/unifieddyes_dark_red.png Binary files differindex 29800e9..daee026 100644 --- a/textures/unifieddyes_dark_red.png +++ b/textures/unifieddyes_dark_red.png diff --git a/textures/unifieddyes_dark_red_s50.png b/textures/unifieddyes_dark_red_s50.png Binary files differindex b5f6844..9525a43 100644 --- a/textures/unifieddyes_dark_red_s50.png +++ b/textures/unifieddyes_dark_red_s50.png diff --git a/textures/unifieddyes_dark_redviolet.png b/textures/unifieddyes_dark_redviolet.png Binary files differindex efd7779..434d45e 100644 --- a/textures/unifieddyes_dark_redviolet.png +++ b/textures/unifieddyes_dark_redviolet.png diff --git a/textures/unifieddyes_dark_redviolet_s50.png b/textures/unifieddyes_dark_redviolet_s50.png Binary files differindex 6d1d48d..aaaf630 100644 --- a/textures/unifieddyes_dark_redviolet_s50.png +++ b/textures/unifieddyes_dark_redviolet_s50.png diff --git a/textures/unifieddyes_dark_skyblue.png b/textures/unifieddyes_dark_skyblue.png Binary files differindex fb1db24..d2f7a97 100644 --- a/textures/unifieddyes_dark_skyblue.png +++ b/textures/unifieddyes_dark_skyblue.png diff --git a/textures/unifieddyes_dark_skyblue_s50.png b/textures/unifieddyes_dark_skyblue_s50.png Binary files differindex 9186ce2..a4723cf 100644 --- a/textures/unifieddyes_dark_skyblue_s50.png +++ b/textures/unifieddyes_dark_skyblue_s50.png diff --git a/textures/unifieddyes_dark_violet.png b/textures/unifieddyes_dark_violet.png Binary files differindex 0544b07..add9319 100644 --- a/textures/unifieddyes_dark_violet.png +++ b/textures/unifieddyes_dark_violet.png diff --git a/textures/unifieddyes_dark_violet_s50.png b/textures/unifieddyes_dark_violet_s50.png Binary files differindex c2bb084..077f0ab 100644 --- a/textures/unifieddyes_dark_violet_s50.png +++ b/textures/unifieddyes_dark_violet_s50.png diff --git a/textures/unifieddyes_dark_yellow.png b/textures/unifieddyes_dark_yellow.png Binary files differindex 0269d07..1209469 100644 --- a/textures/unifieddyes_dark_yellow.png +++ b/textures/unifieddyes_dark_yellow.png diff --git a/textures/unifieddyes_dark_yellow_s50.png b/textures/unifieddyes_dark_yellow_s50.png Binary files differindex 74d10fa..816c7f0 100644 --- a/textures/unifieddyes_dark_yellow_s50.png +++ b/textures/unifieddyes_dark_yellow_s50.png diff --git a/textures/unifieddyes_darkgrey.png b/textures/unifieddyes_darkgrey.png Binary files differnew file mode 100644 index 0000000..5e9b6fe --- /dev/null +++ b/textures/unifieddyes_darkgrey.png diff --git a/textures/unifieddyes_green_s50.png b/textures/unifieddyes_green_s50.png Binary files differindex a0a3f13..5a27093 100644 --- a/textures/unifieddyes_green_s50.png +++ b/textures/unifieddyes_green_s50.png diff --git a/textures/unifieddyes_light_aqua.png b/textures/unifieddyes_light_aqua.png Binary files differindex 681205a..474d9c9 100644 --- a/textures/unifieddyes_light_aqua.png +++ b/textures/unifieddyes_light_aqua.png diff --git a/textures/unifieddyes_light_blue.png b/textures/unifieddyes_light_blue.png Binary files differindex 263f638..0c0e425 100644 --- a/textures/unifieddyes_light_blue.png +++ b/textures/unifieddyes_light_blue.png diff --git a/textures/unifieddyes_light_cyan.png b/textures/unifieddyes_light_cyan.png Binary files differindex b7451c7..b8104ba 100644 --- a/textures/unifieddyes_light_cyan.png +++ b/textures/unifieddyes_light_cyan.png diff --git a/textures/unifieddyes_light_green.png b/textures/unifieddyes_light_green.png Binary files differindex 78c810e..d3a6e4d 100644 --- a/textures/unifieddyes_light_green.png +++ b/textures/unifieddyes_light_green.png diff --git a/textures/unifieddyes_light_lime.png b/textures/unifieddyes_light_lime.png Binary files differindex 9a9ad9f..988d090 100644 --- a/textures/unifieddyes_light_lime.png +++ b/textures/unifieddyes_light_lime.png diff --git a/textures/unifieddyes_light_magenta.png b/textures/unifieddyes_light_magenta.png Binary files differindex 810ed94..8ea9df2 100644 --- a/textures/unifieddyes_light_magenta.png +++ b/textures/unifieddyes_light_magenta.png diff --git a/textures/unifieddyes_light_orange.png b/textures/unifieddyes_light_orange.png Binary files differindex f4309c5..b76312f 100644 --- a/textures/unifieddyes_light_orange.png +++ b/textures/unifieddyes_light_orange.png diff --git a/textures/unifieddyes_light_red.png b/textures/unifieddyes_light_red.png Binary files differindex 40b5477..c539595 100644 --- a/textures/unifieddyes_light_red.png +++ b/textures/unifieddyes_light_red.png diff --git a/textures/unifieddyes_light_redviolet.png b/textures/unifieddyes_light_redviolet.png Binary files differindex e617115..213c9c7 100644 --- a/textures/unifieddyes_light_redviolet.png +++ b/textures/unifieddyes_light_redviolet.png diff --git a/textures/unifieddyes_light_skyblue.png b/textures/unifieddyes_light_skyblue.png Binary files differindex e0dcf61..c8a4c0a 100644 --- a/textures/unifieddyes_light_skyblue.png +++ b/textures/unifieddyes_light_skyblue.png diff --git a/textures/unifieddyes_light_violet.png b/textures/unifieddyes_light_violet.png Binary files differindex 0dbdad4..bdda547 100644 --- a/textures/unifieddyes_light_violet.png +++ b/textures/unifieddyes_light_violet.png diff --git a/textures/unifieddyes_light_yellow.png b/textures/unifieddyes_light_yellow.png Binary files differindex 9607f7a..9b960c6 100644 --- a/textures/unifieddyes_light_yellow.png +++ b/textures/unifieddyes_light_yellow.png diff --git a/textures/unifieddyes_lightgrey.png b/textures/unifieddyes_lightgrey.png Binary files differnew file mode 100644 index 0000000..c523dad --- /dev/null +++ b/textures/unifieddyes_lightgrey.png diff --git a/textures/unifieddyes_lime.png b/textures/unifieddyes_lime.png Binary files differindex 03d5505..aaa9430 100644 --- a/textures/unifieddyes_lime.png +++ b/textures/unifieddyes_lime.png diff --git a/textures/unifieddyes_lime_s50.png b/textures/unifieddyes_lime_s50.png Binary files differindex 7471b89..3ab346e 100644 --- a/textures/unifieddyes_lime_s50.png +++ b/textures/unifieddyes_lime_s50.png diff --git a/textures/unifieddyes_magenta_s50.png b/textures/unifieddyes_magenta_s50.png Binary files differindex c83d3b3..6e93fea 100644 --- a/textures/unifieddyes_magenta_s50.png +++ b/textures/unifieddyes_magenta_s50.png diff --git a/textures/unifieddyes_medium_aqua.png b/textures/unifieddyes_medium_aqua.png Binary files differindex fdef3df..d7db917 100644 --- a/textures/unifieddyes_medium_aqua.png +++ b/textures/unifieddyes_medium_aqua.png diff --git a/textures/unifieddyes_medium_aqua_s50.png b/textures/unifieddyes_medium_aqua_s50.png Binary files differindex 50b2a49..7206406 100644 --- a/textures/unifieddyes_medium_aqua_s50.png +++ b/textures/unifieddyes_medium_aqua_s50.png diff --git a/textures/unifieddyes_medium_blue.png b/textures/unifieddyes_medium_blue.png Binary files differindex a39c5c8..7560360 100644 --- a/textures/unifieddyes_medium_blue.png +++ b/textures/unifieddyes_medium_blue.png diff --git a/textures/unifieddyes_medium_blue_s50.png b/textures/unifieddyes_medium_blue_s50.png Binary files differindex eb97ff4..2ca079f 100644 --- a/textures/unifieddyes_medium_blue_s50.png +++ b/textures/unifieddyes_medium_blue_s50.png diff --git a/textures/unifieddyes_medium_cyan.png b/textures/unifieddyes_medium_cyan.png Binary files differindex 320cc5f..aee6a6c 100644 --- a/textures/unifieddyes_medium_cyan.png +++ b/textures/unifieddyes_medium_cyan.png diff --git a/textures/unifieddyes_medium_cyan_s50.png b/textures/unifieddyes_medium_cyan_s50.png Binary files differindex 977e68e..3701f9b 100644 --- a/textures/unifieddyes_medium_cyan_s50.png +++ b/textures/unifieddyes_medium_cyan_s50.png diff --git a/textures/unifieddyes_medium_green.png b/textures/unifieddyes_medium_green.png Binary files differindex 981ce9e..9278551 100644 --- a/textures/unifieddyes_medium_green.png +++ b/textures/unifieddyes_medium_green.png diff --git a/textures/unifieddyes_medium_green_s50.png b/textures/unifieddyes_medium_green_s50.png Binary files differindex c109584..25829cc 100644 --- a/textures/unifieddyes_medium_green_s50.png +++ b/textures/unifieddyes_medium_green_s50.png diff --git a/textures/unifieddyes_medium_lime.png b/textures/unifieddyes_medium_lime.png Binary files differindex 1919bd2..88e3469 100644 --- a/textures/unifieddyes_medium_lime.png +++ b/textures/unifieddyes_medium_lime.png diff --git a/textures/unifieddyes_medium_lime_s50.png b/textures/unifieddyes_medium_lime_s50.png Binary files differindex ef5f7f5..5674ad8 100644 --- a/textures/unifieddyes_medium_lime_s50.png +++ b/textures/unifieddyes_medium_lime_s50.png diff --git a/textures/unifieddyes_medium_magenta.png b/textures/unifieddyes_medium_magenta.png Binary files differindex 3bed929..07baf68 100644 --- a/textures/unifieddyes_medium_magenta.png +++ b/textures/unifieddyes_medium_magenta.png diff --git a/textures/unifieddyes_medium_magenta_s50.png b/textures/unifieddyes_medium_magenta_s50.png Binary files differindex eb36270..d8d9b6e 100644 --- a/textures/unifieddyes_medium_magenta_s50.png +++ b/textures/unifieddyes_medium_magenta_s50.png diff --git a/textures/unifieddyes_medium_orange.png b/textures/unifieddyes_medium_orange.png Binary files differindex d5f62c6..7b7d001 100644 --- a/textures/unifieddyes_medium_orange.png +++ b/textures/unifieddyes_medium_orange.png diff --git a/textures/unifieddyes_medium_orange_s50.png b/textures/unifieddyes_medium_orange_s50.png Binary files differindex 34eadfc..75eae93 100644 --- a/textures/unifieddyes_medium_orange_s50.png +++ b/textures/unifieddyes_medium_orange_s50.png diff --git a/textures/unifieddyes_medium_red.png b/textures/unifieddyes_medium_red.png Binary files differindex db74db2..1ff7ae5 100644 --- a/textures/unifieddyes_medium_red.png +++ b/textures/unifieddyes_medium_red.png diff --git a/textures/unifieddyes_medium_red_s50.png b/textures/unifieddyes_medium_red_s50.png Binary files differindex 28ddfc9..20922cd 100644 --- a/textures/unifieddyes_medium_red_s50.png +++ b/textures/unifieddyes_medium_red_s50.png diff --git a/textures/unifieddyes_medium_redviolet.png b/textures/unifieddyes_medium_redviolet.png Binary files differindex 25176ec..44e1783 100644 --- a/textures/unifieddyes_medium_redviolet.png +++ b/textures/unifieddyes_medium_redviolet.png diff --git a/textures/unifieddyes_medium_redviolet_s50.png b/textures/unifieddyes_medium_redviolet_s50.png Binary files differindex 8699abb..2a6ef0e 100644 --- a/textures/unifieddyes_medium_redviolet_s50.png +++ b/textures/unifieddyes_medium_redviolet_s50.png diff --git a/textures/unifieddyes_medium_skyblue.png b/textures/unifieddyes_medium_skyblue.png Binary files differindex 590e62b..8b5e4af 100644 --- a/textures/unifieddyes_medium_skyblue.png +++ b/textures/unifieddyes_medium_skyblue.png diff --git a/textures/unifieddyes_medium_skyblue_s50.png b/textures/unifieddyes_medium_skyblue_s50.png Binary files differindex f86eabc..3f67327 100644 --- a/textures/unifieddyes_medium_skyblue_s50.png +++ b/textures/unifieddyes_medium_skyblue_s50.png diff --git a/textures/unifieddyes_medium_violet.png b/textures/unifieddyes_medium_violet.png Binary files differindex 9691b94..8457b63 100644 --- a/textures/unifieddyes_medium_violet.png +++ b/textures/unifieddyes_medium_violet.png diff --git a/textures/unifieddyes_medium_violet_s50.png b/textures/unifieddyes_medium_violet_s50.png Binary files differindex e8cfaf4..ff6361a 100644 --- a/textures/unifieddyes_medium_violet_s50.png +++ b/textures/unifieddyes_medium_violet_s50.png diff --git a/textures/unifieddyes_medium_yellow.png b/textures/unifieddyes_medium_yellow.png Binary files differindex 1cc4f01..a8cf4a9 100644 --- a/textures/unifieddyes_medium_yellow.png +++ b/textures/unifieddyes_medium_yellow.png diff --git a/textures/unifieddyes_medium_yellow_s50.png b/textures/unifieddyes_medium_yellow_s50.png Binary files differindex a789a05..d615308 100644 --- a/textures/unifieddyes_medium_yellow_s50.png +++ b/textures/unifieddyes_medium_yellow_s50.png diff --git a/textures/unifieddyes_orange_s50.png b/textures/unifieddyes_orange_s50.png Binary files differindex acab964..3caead8 100644 --- a/textures/unifieddyes_orange_s50.png +++ b/textures/unifieddyes_orange_s50.png diff --git a/textures/unifieddyes_red_s50.png b/textures/unifieddyes_red_s50.png Binary files differindex b42b6ab..bad312e 100644 --- a/textures/unifieddyes_red_s50.png +++ b/textures/unifieddyes_red_s50.png diff --git a/textures/unifieddyes_redviolet.png b/textures/unifieddyes_redviolet.png Binary files differindex 15cec97..38eceaa 100644 --- a/textures/unifieddyes_redviolet.png +++ b/textures/unifieddyes_redviolet.png diff --git a/textures/unifieddyes_redviolet_s50.png b/textures/unifieddyes_redviolet_s50.png Binary files differindex 8adfbf3..598f40b 100644 --- a/textures/unifieddyes_redviolet_s50.png +++ b/textures/unifieddyes_redviolet_s50.png diff --git a/textures/unifieddyes_skyblue.png b/textures/unifieddyes_skyblue.png Binary files differindex 0971a82..5dc2241 100644 --- a/textures/unifieddyes_skyblue.png +++ b/textures/unifieddyes_skyblue.png diff --git a/textures/unifieddyes_skyblue_s50.png b/textures/unifieddyes_skyblue_s50.png Binary files differindex c9074a4..9ba85e0 100644 --- a/textures/unifieddyes_skyblue_s50.png +++ b/textures/unifieddyes_skyblue_s50.png diff --git a/textures/unifieddyes_violet_s50.png b/textures/unifieddyes_violet_s50.png Binary files differindex c58de52..d6e2352 100644 --- a/textures/unifieddyes_violet_s50.png +++ b/textures/unifieddyes_violet_s50.png diff --git a/textures/unifieddyes_yellow_s50.png b/textures/unifieddyes_yellow_s50.png Binary files differindex eb23372..8f29961 100644 --- a/textures/unifieddyes_yellow_s50.png +++ b/textures/unifieddyes_yellow_s50.png |
