diff --git a/mods/hades_chests/init.lua b/mods/hades_chests/init.lua index 1665a0d..fd4f6ee 100644 --- a/mods/hades_chests/init.lua +++ b/mods/hades_chests/init.lua @@ -181,7 +181,7 @@ if sub ~= "" then minetest.register_craft({ type = "shapeless", output = itemstring_unlocked, - recipe = { "group:unlocked_chest", "dye:"..sub }, + recipe = { "group:unlocked_chest", "hades_dye:"..sub }, }) minetest.register_craft({ type = "shapeless", @@ -191,7 +191,7 @@ if sub ~= "" then minetest.register_craft({ type = "shapeless", output = itemstring_locked, - recipe = { "group:locked_chest", "dye:"..sub }, + recipe = { "group:locked_chest", "hades_dye:"..sub }, }) minetest.register_craft({ output = itemstring_unlocked, diff --git a/mods/hades_craftguide/init.lua b/mods/hades_craftguide/init.lua index 378a4e4..dba97b7 100644 --- a/mods/hades_craftguide/init.lua +++ b/mods/hades_craftguide/init.lua @@ -11,7 +11,7 @@ local usages_cache = {} local group_stereotypes = { cloth = "hades_cloth:white", - dye = "dye:white", + dye = "hades_dye:white", vessel = "hades_vessels:glass_bottle", coal = "hades_core:coal_lump", flower = "hades_flowers:yellow", diff --git a/mods/hades_doors/register.lua b/mods/hades_doors/register.lua index b18943b..f15774e 100644 --- a/mods/hades_doors/register.lua +++ b/mods/hades_doors/register.lua @@ -129,21 +129,21 @@ minetest.register_craft({ -- colored Steeldoors local colors = { - { "black", S("Black Steel Door"), "dye:black" }, - { "grey", S("Grey Steel Door"), "dye:grey" }, - { "darkgrey", S("Dark Grey Steel Door"), "dye:dark_grey" }, - { "white", S("White Steel Door"), "dye:white" }, - { "magenta", S("Magenta Steel Door"), "dye:magenta" }, - { "violet", S("Violet Steel Door"), "dye:violet" }, - { "blue", S("Blue Steel Door"), "dye:blue" }, - { "cyan", S("Cyan Steel Door"), "dye:cyan" }, - { "green", S("Green Steel Door"), "dye:green" }, - { "darkgreen", S("Dark Green Steel Door"), "dye:dark_green" }, - { "pink", S("Pink Steel Door"), "dye:pink" }, - { "red", S("Red Steel Door"), "dye:red" }, - { "orange", S("Orange Steel Door"), "dye:orange" }, - { "brown", S("Brown Steel Door"), "dye:brown" }, - { "yellow", S("Yellow Steel Door"), "dye:yellow" }, + { "black", S("Black Steel Door"), "hades_dye:black" }, + { "grey", S("Grey Steel Door"), "hades_dye:grey" }, + { "darkgrey", S("Dark Grey Steel Door"), "hades_dye:dark_grey" }, + { "white", S("White Steel Door"), "hades_dye:white" }, + { "magenta", S("Magenta Steel Door"), "hades_dye:magenta" }, + { "violet", S("Violet Steel Door"), "hades_dye:violet" }, + { "blue", S("Blue Steel Door"), "hades_dye:blue" }, + { "cyan", S("Cyan Steel Door"), "hades_dye:cyan" }, + { "green", S("Green Steel Door"), "hades_dye:green" }, + { "darkgreen", S("Dark Green Steel Door"), "hades_dye:dark_green" }, + { "pink", S("Pink Steel Door"), "hades_dye:pink" }, + { "red", S("Red Steel Door"), "hades_dye:red" }, + { "orange", S("Orange Steel Door"), "hades_dye:orange" }, + { "brown", S("Brown Steel Door"), "hades_dye:brown" }, + { "yellow", S("Yellow Steel Door"), "hades_dye:yellow" }, } for c=1, #colors do diff --git a/mods/dye/README.txt b/mods/hades_dye/README.txt similarity index 81% rename from mods/dye/README.txt rename to mods/hades_dye/README.txt index 58e87fa..b670cd8 100644 --- a/mods/dye/README.txt +++ b/mods/hades_dye/README.txt @@ -1,5 +1,5 @@ -Minetest 0.4 mod: dye -====================== +hades_dye +========= See init.lua for documentation. diff --git a/mods/dye/init.lua b/mods/hades_dye/init.lua similarity index 78% rename from mods/dye/init.lua rename to mods/hades_dye/init.lua index fb60c49..ff89dd7 100644 --- a/mods/dye/init.lua +++ b/mods/hades_dye/init.lua @@ -1,6 +1,4 @@ -local S = minetest.get_translator("dye") - --- minetest/dye/init.lua +local S = minetest.get_translator("hades_dye") -- To make recipes that will work with any dye ever made by anybody, define -- them based on groups. @@ -15,10 +13,9 @@ local S = minetest.get_translator("dye") -- recipe = {':item_no_color', 'group:basecolor_yellow'}, -- }) --- Other mods can use these for looping through available colors -local 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"} +local hades_dye = {} +hades_dye.basecolors = {"white", "grey", "black", "red", "yellow", "green", "cyan", "blue", "magenta"} +hades_dye.excolors = {"white", "lightgrey", "grey", "darkgrey", "black", "red", "orange", "yellow", "lime", "green", "aqua", "cyan", "sky_blue", "blue", "violet", "magenta", "red_violet"} -- Base color groups: -- - basecolor_white @@ -87,7 +84,7 @@ for _, row in ipairs(dyelocal.dyes) do local name = row[1] local description = row[2] local groups = row[3] - local item_name = "dye:"..name + local item_name = "hades_dye:"..name local item_image = "dye_"..name..".png" minetest.register_craftitem(item_name, { inventory_image = item_image, @@ -125,8 +122,8 @@ for one,results in pairs(dyelocal.mixes) do if one ~= another then minetest.register_craft({ type = "shapeless", - output = 'dye:'..result..' 2', - recipe = {'dye:'..one, 'dye:'..another}, + output = 'hades_dye:'..result..' 2', + recipe = {'hades_dye:'..one, 'hades_dye:'..another}, }) end end @@ -134,75 +131,75 @@ end minetest.register_craft({ type = "shapeless", - output = "dye:blue 4", + output = "hades_dye:blue 4", recipe = {"hades_flowers:blue"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:white 4", + output = "hades_dye:white 4", recipe = {"hades_flowers:white"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:red 4", + output = "hades_dye:red 4", recipe = {"hades_flowers:red"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:violet 4", + output = "hades_dye:violet 4", recipe = {"hades_flowers:violet"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:orange 4", + output = "hades_dye:orange 4", recipe = {"hades_flowers:orange"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:yellow 4", + output = "hades_dye:yellow 4", recipe = {"hades_flowers:yellow"}, }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "dye:red 8", + output = "hades_dye:red 8", recipe = "hades_core:cinnaber", }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "dye:orange 8", + output = "hades_dye:orange 8", recipe = "hades_core:orangite", }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "dye:yellow 8", + output = "hades_dye:yellow 8", recipe = "hades_core:apolline", }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "dye:green 8", + output = "hades_dye:green 8", recipe = "hades_core:olivine", }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "dye:cyan 8", + output = "hades_dye:cyan 8", recipe = "hades_core:turquosite", }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "dye:violet 8", + output = "hades_dye:violet 8", recipe = "hades_core:lillite", }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "dye:blue 8", + output = "hades_dye:blue 8", recipe = "hades_core:azurite", }) @@ -210,24 +207,41 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", - output = "dye:black 4", + output = "hades_dye:black 4", recipe = {"hades_core:coal_lump"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:green 4", + output = "hades_dye:green 4", recipe = {"hades_core:papyrus"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:green 4", + output = "hades_dye:green 4", recipe = {"hades_core:cactus"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:brown", + output = "hades_dye:brown", recipe = {"hades_trees:cocoa_bean"}, }) + +-- Legacy aliases +minetest.register_alias("dye:black", "hades_dye:black") +minetest.register_alias("dye:blue", "hades_dye:blue") +minetest.register_alias("dye:brown", "hades_dye:brown") +minetest.register_alias("dye:cyan", "hades_dye:cyan") +minetest.register_alias("dye:dark_green", "hades_dye:dark_green") +minetest.register_alias("dye:dark_grey", "hades_dye:dark_grey") +minetest.register_alias("dye:green", "hades_dye:green") +minetest.register_alias("dye:grey", "hades_dye:grey") +minetest.register_alias("dye:magenta", "hades_dye:magenta") +minetest.register_alias("dye:orange", "hades_dye:orange") +minetest.register_alias("dye:pink", "hades_dye:pink") +minetest.register_alias("dye:red", "hades_dye:red") +minetest.register_alias("dye:violet", "hades_dye:violet") +minetest.register_alias("dye:white", "hades_dye:white") +minetest.register_alias("dye:yellow", "hades_dye:yellow") diff --git a/mods/dye/locale/dye.de.tr b/mods/hades_dye/locale/hades_dye.de.tr similarity index 94% rename from mods/dye/locale/dye.de.tr rename to mods/hades_dye/locale/hades_dye.de.tr index f73fb57..dd16271 100644 --- a/mods/dye/locale/dye.de.tr +++ b/mods/hades_dye/locale/hades_dye.de.tr @@ -1,4 +1,4 @@ -# textdomain: dye +# textdomain: hades_dye White Dye=Weißer Farbstoff Grey Dye=Grauer Farbstoff Dark Grey Dye=Dunkelgrauer Farbstoff diff --git a/mods/dye/locale/template.txt b/mods/hades_dye/locale/template.txt similarity index 87% rename from mods/dye/locale/template.txt rename to mods/hades_dye/locale/template.txt index c20bab5..362e6cd 100644 --- a/mods/dye/locale/template.txt +++ b/mods/hades_dye/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: dye +# textdomain: hades_dye White Dye= Grey Dye= Dark Grey Dye= diff --git a/mods/dye/mod.conf b/mods/hades_dye/mod.conf similarity index 67% rename from mods/dye/mod.conf rename to mods/hades_dye/mod.conf index 987346c..7f693aa 100644 --- a/mods/dye/mod.conf +++ b/mods/hades_dye/mod.conf @@ -1,2 +1,2 @@ -name = dye +name = hades_dye depends = hades_core, hades_flowers diff --git a/mods/dye/textures/dye_black.png b/mods/hades_dye/textures/dye_black.png similarity index 100% rename from mods/dye/textures/dye_black.png rename to mods/hades_dye/textures/dye_black.png diff --git a/mods/dye/textures/dye_blue.png b/mods/hades_dye/textures/dye_blue.png similarity index 100% rename from mods/dye/textures/dye_blue.png rename to mods/hades_dye/textures/dye_blue.png diff --git a/mods/dye/textures/dye_brown.png b/mods/hades_dye/textures/dye_brown.png similarity index 100% rename from mods/dye/textures/dye_brown.png rename to mods/hades_dye/textures/dye_brown.png diff --git a/mods/dye/textures/dye_cyan.png b/mods/hades_dye/textures/dye_cyan.png similarity index 100% rename from mods/dye/textures/dye_cyan.png rename to mods/hades_dye/textures/dye_cyan.png diff --git a/mods/dye/textures/dye_dark_green.png b/mods/hades_dye/textures/dye_dark_green.png similarity index 100% rename from mods/dye/textures/dye_dark_green.png rename to mods/hades_dye/textures/dye_dark_green.png diff --git a/mods/dye/textures/dye_dark_grey.png b/mods/hades_dye/textures/dye_dark_grey.png similarity index 100% rename from mods/dye/textures/dye_dark_grey.png rename to mods/hades_dye/textures/dye_dark_grey.png diff --git a/mods/dye/textures/dye_green.png b/mods/hades_dye/textures/dye_green.png similarity index 100% rename from mods/dye/textures/dye_green.png rename to mods/hades_dye/textures/dye_green.png diff --git a/mods/dye/textures/dye_grey.png b/mods/hades_dye/textures/dye_grey.png similarity index 100% rename from mods/dye/textures/dye_grey.png rename to mods/hades_dye/textures/dye_grey.png diff --git a/mods/dye/textures/dye_magenta.png b/mods/hades_dye/textures/dye_magenta.png similarity index 100% rename from mods/dye/textures/dye_magenta.png rename to mods/hades_dye/textures/dye_magenta.png diff --git a/mods/dye/textures/dye_orange.png b/mods/hades_dye/textures/dye_orange.png similarity index 100% rename from mods/dye/textures/dye_orange.png rename to mods/hades_dye/textures/dye_orange.png diff --git a/mods/dye/textures/dye_pink.png b/mods/hades_dye/textures/dye_pink.png similarity index 100% rename from mods/dye/textures/dye_pink.png rename to mods/hades_dye/textures/dye_pink.png diff --git a/mods/dye/textures/dye_red.png b/mods/hades_dye/textures/dye_red.png similarity index 100% rename from mods/dye/textures/dye_red.png rename to mods/hades_dye/textures/dye_red.png diff --git a/mods/dye/textures/dye_violet.png b/mods/hades_dye/textures/dye_violet.png similarity index 100% rename from mods/dye/textures/dye_violet.png rename to mods/hades_dye/textures/dye_violet.png diff --git a/mods/dye/textures/dye_white.png b/mods/hades_dye/textures/dye_white.png similarity index 100% rename from mods/dye/textures/dye_white.png rename to mods/hades_dye/textures/dye_white.png diff --git a/mods/dye/textures/dye_yellow.png b/mods/hades_dye/textures/dye_yellow.png similarity index 100% rename from mods/dye/textures/dye_yellow.png rename to mods/hades_dye/textures/dye_yellow.png diff --git a/mods/hades_fences/crafting.lua b/mods/hades_fences/crafting.lua index 73ed1c2..e5eeef6 100644 --- a/mods/hades_fences/crafting.lua +++ b/mods/hades_fences/crafting.lua @@ -65,91 +65,91 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_black', - recipe = {'group:fence_colwood', 'dye:black'}, + recipe = {'group:fence_colwood', 'hades_dye:black'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_blue', - recipe = {'group:fence_colwood', 'dye:blue'}, + recipe = {'group:fence_colwood', 'hades_dye:blue'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_brown', - recipe = {'group:fence_colwood', 'dye:brown'}, + recipe = {'group:fence_colwood', 'hades_dye:brown'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_cyan', - recipe = {'group:fence_colwood', 'dye:cyan'}, + recipe = {'group:fence_colwood', 'hades_dye:cyan'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_dark_green', - recipe = {'group:fence_colwood', 'dye:dark_green'}, + recipe = {'group:fence_colwood', 'hades_dye:dark_green'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_dark_grey', - recipe = {'group:fence_colwood', 'dye:dark_grey'}, + recipe = {'group:fence_colwood', 'hades_dye:dark_grey'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_green', - recipe = {'group:fence_colwood', 'dye:green'}, + recipe = {'group:fence_colwood', 'hades_dye:green'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_grey', - recipe = {'group:fence_colwood', 'dye:grey'}, + recipe = {'group:fence_colwood', 'hades_dye:grey'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_magenta', - recipe = {'group:fence_colwood', 'dye:magenta'}, + recipe = {'group:fence_colwood', 'hades_dye:magenta'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_orange', - recipe = {'group:fence_colwood', 'dye:orange'}, + recipe = {'group:fence_colwood', 'hades_dye:orange'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_pink', - recipe = {'group:fence_colwood', 'dye:pink'}, + recipe = {'group:fence_colwood', 'hades_dye:pink'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_red', - recipe = {'group:fence_colwood', 'dye:red'}, + recipe = {'group:fence_colwood', 'hades_dye:red'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_violet', - recipe = {'group:fence_colwood', 'dye:violet'}, + recipe = {'group:fence_colwood', 'hades_dye:violet'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_white', - recipe = {'group:fence_colwood', 'dye:white'}, + recipe = {'group:fence_colwood', 'hades_dye:white'}, }) minetest.register_craft({ type = "shapeless", output = 'hades_fences:fence_wood_yellow', - recipe = {'group:fence_colwood', 'dye:yellow'}, + recipe = {'group:fence_colwood', 'hades_dye:yellow'}, }) minetest.register_craft({ diff --git a/mods/hades_furniture/crafting.lua b/mods/hades_furniture/crafting.lua index 050506e..2a6e036 100644 --- a/mods/hades_furniture/crafting.lua +++ b/mods/hades_furniture/crafting.lua @@ -39,14 +39,14 @@ type = 'shapeless', output = 'hades_furniture:table_black', recipe = { - 'group:table', 'dye:black' + 'group:table', 'hades_dye:black' } }) minetest.register_craft( { type = 'shapeless', output = 'hades_furniture:table_white', recipe = { - 'group:table', 'dye:white' + 'group:table', 'hades_dye:white' } }) @@ -106,14 +106,14 @@ type = 'shapeless', output = 'hades_furniture:chair_black', recipe = { - 'group:chair', 'dye:black' + 'group:chair', 'hades_dye:black' } }) minetest.register_craft( { type = 'shapeless', output = 'hades_furniture:chair_white', recipe = { - 'group:chair', 'dye:white' + 'group:chair', 'hades_dye:white' } }) @@ -144,32 +144,32 @@ minetest.register_craft( { type = 'shapeless', output = 'hades_furniture:armchair', - recipe = { 'group:armchair', 'dye:black' } + recipe = { 'group:armchair', 'hades_dye:black' } }) minetest.register_craft( { type = 'shapeless', output = 'hades_furniture:armchair_white', - recipe = { 'group:armchair', 'dye:white' } + recipe = { 'group:armchair', 'hades_dye:white' } }) minetest.register_craft( { type = 'shapeless', output = 'hades_furniture:armchair_blue', - recipe = { 'group:armchair', 'dye:blue' } + recipe = { 'group:armchair', 'hades_dye:blue' } }) minetest.register_craft( { type = 'shapeless', output = 'hades_furniture:armchair_brown', - recipe = { 'group:armchair', 'dye:brown' } + recipe = { 'group:armchair', 'hades_dye:brown' } }) minetest.register_craft( { type = 'shapeless', output = 'hades_furniture:armchair_red', - recipe = { 'group:armchair', 'dye:red' } + recipe = { 'group:armchair', 'hades_dye:red' } }) minetest.register_craft( { type = 'shapeless', output = 'hades_furniture:armchair_dark_green', - recipe = { 'group:armchair', 'dye:dark_green' } + recipe = { 'group:armchair', 'hades_dye:dark_green' } }) diff --git a/mods/hades_trees/crafting.lua b/mods/hades_trees/crafting.lua index 82adcbc..88b7237 100644 --- a/mods/hades_trees/crafting.lua +++ b/mods/hades_trees/crafting.lua @@ -44,105 +44,105 @@ minetest.register_craft({ minetest.register_craft({ output = 'hades_trees:colwood_black', recipe = { - {'group:wood', 'dye:black'}, + {'group:wood', 'hades_dye:black'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_blue', recipe = { - {'group:wood', 'dye:blue'}, + {'group:wood', 'hades_dye:blue'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_brown', recipe = { - {'group:wood', 'dye:brown'}, + {'group:wood', 'hades_dye:brown'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_cyan', recipe = { - {'group:wood', 'dye:cyan'}, + {'group:wood', 'hades_dye:cyan'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_dark_green', recipe = { - {'group:wood', 'dye:dark_green'}, + {'group:wood', 'hades_dye:dark_green'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_dark_grey', recipe = { - {'group:wood', 'dye:dark_grey'}, + {'group:wood', 'hades_dye:dark_grey'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_green', recipe = { - {'group:wood', 'dye:green'}, + {'group:wood', 'hades_dye:green'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_grey', recipe = { - {'group:wood', 'dye:grey'}, + {'group:wood', 'hades_dye:grey'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_magenta', recipe = { - {'group:wood', 'dye:magenta'}, + {'group:wood', 'hades_dye:magenta'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_orange', recipe = { - {'group:wood', 'dye:orange'}, + {'group:wood', 'hades_dye:orange'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_pink', recipe = { - {'group:wood', 'dye:pink'}, + {'group:wood', 'hades_dye:pink'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_red', recipe = { - {'group:wood', 'dye:red'}, + {'group:wood', 'hades_dye:red'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_violet', recipe = { - {'group:wood', 'dye:violet'}, + {'group:wood', 'hades_dye:violet'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_white', recipe = { - {'group:wood', 'dye:white'}, + {'group:wood', 'hades_dye:white'}, } }) minetest.register_craft({ output = 'hades_trees:colwood_yellow', recipe = { - {'group:wood', 'dye:yellow'}, + {'group:wood', 'hades_dye:yellow'}, } }) diff --git a/mods/hades_windows/init.lua b/mods/hades_windows/init.lua index bbc6144..ee1b83f 100644 --- a/mods/hades_windows/init.lua +++ b/mods/hades_windows/init.lua @@ -144,21 +144,21 @@ minetest.register_craft({ }) local windows_simple = { - { "wood_white", S("White Canvas Wood Window"), "dye:white"}, - { "wood_darkgrey", S("Dark Grey Canvas Wood Window"), "dye:dark_grey"}, - { "wood_grey", S("Grey Canvas Wood Window"), "dye:grey"}, - { "wood_black", S("Black Canvas Wood Window"), "dye:black"}, - { "wood_red", S("Red Canvas Wood Window"), "dye:red"}, - { "wood_magenta", S("Magenta Canvas Wood Window"), "dye:magenta"}, - { "wood_violet", S("Violet Canvas Wood Window"), "dye:violet"}, - { "wood_blue", S("Blue Canvas Wood Window"), "dye:blue"}, - { "wood_cyan", S("Cyan Canvas Wood Window"), "dye:cyan"}, - { "wood_green", S("Green Canvas Wood Window"), "dye:green"}, - { "wood_darkgreen", S("Dark Green Canvas Wood Window"), "dye:dark_green"}, - { "wood_pink", S("Pink Canvas Wood Window"), "dye:pink"}, - { "wood_yellow", S("Yellow Canvas Wood Window"), "dye:yellow"}, - { "wood_orange", S("Orange Canvas Wood Window"), "dye:orange"}, - { "wood_brown", S("Brown Canvas Wood Window"), "dye:brown"}, + { "wood_white", S("White Canvas Wood Window"), "hades_dye:white"}, + { "wood_darkgrey", S("Dark Grey Canvas Wood Window"), "hades_dye:dark_grey"}, + { "wood_grey", S("Grey Canvas Wood Window"), "hades_dye:grey"}, + { "wood_black", S("Black Canvas Wood Window"), "hades_dye:black"}, + { "wood_red", S("Red Canvas Wood Window"), "hades_dye:red"}, + { "wood_magenta", S("Magenta Canvas Wood Window"), "hades_dye:magenta"}, + { "wood_violet", S("Violet Canvas Wood Window"), "hades_dye:violet"}, + { "wood_blue", S("Blue Canvas Wood Window"), "hades_dye:blue"}, + { "wood_cyan", S("Cyan Canvas Wood Window"), "hades_dye:cyan"}, + { "wood_green", S("Green Canvas Wood Window"), "hades_dye:green"}, + { "wood_darkgreen", S("Dark Green Canvas Wood Window"), "hades_dye:dark_green"}, + { "wood_pink", S("Pink Canvas Wood Window"), "hades_dye:pink"}, + { "wood_yellow", S("Yellow Canvas Wood Window"), "hades_dye:yellow"}, + { "wood_orange", S("Orange Canvas Wood Window"), "hades_dye:orange"}, + { "wood_brown", S("Brown Canvas Wood Window"), "hades_dye:brown"}, } for w=1, #windows_simple do hades_windows.register_window("hades_windows:window_"..windows_simple[w][1], { diff --git a/mods/mobs/mod.conf b/mods/mobs/mod.conf index 5b82448..f22cdaa 100644 --- a/mods/mobs/mod.conf +++ b/mods/mobs/mod.conf @@ -1,4 +1,4 @@ name = mobs description = Hades Revisited's mob API for mods to add monsters, etc. depends = hades_core, hades_player -optional_depends = tnt, dye, invisibility, lucky_block, cmi +optional_depends = tnt, hades_dye, invisibility, lucky_block, cmi diff --git a/mods/signs_lib/init.lua b/mods/signs_lib/init.lua index 68a11dd..147a140 100644 --- a/mods/signs_lib/init.lua +++ b/mods/signs_lib/init.lua @@ -938,7 +938,7 @@ minetest.register_craft({ minetest.register_craft( { output = "signs_lib:sign_wall_green 4", recipe = { - { "dye:dark_green", "dye:white", "dye:dark_green" }, + { "hades_dye:dark_green", "hades_dye:white", "hades_dye:dark_green" }, { "hades_core:steel_ingot", "hades_core:steel_ingot", "hades_core:steel_ingot" }, { "", "hades_core:steel_rod", "" } }, @@ -946,7 +946,7 @@ minetest.register_craft( { minetest.register_craft( { output = "signs_lib:sign_wall_yellow 4", recipe = { - { "dye:yellow", "dye:black", "dye:yellow" }, + { "hades_dye:yellow", "hades_dye:black", "hades_dye:yellow" }, { "hades_core:steel_ingot", "hades_core:steel_ingot", "hades_core:steel_ingot" }, { "", "hades_core:steel_rod", "" } }, @@ -954,7 +954,7 @@ minetest.register_craft( { minetest.register_craft( { output = "signs_lib:sign_wall_red 4", recipe = { - { "dye:red", "dye:white", "dye:red" }, + { "hades_dye:red", "hades_dye:white", "hades_dye:red" }, { "hades_core:steel_ingot", "hades_core:steel_ingot", "hades_core:steel_ingot" }, { "", "hades_core:steel_rod", "" } }, @@ -962,7 +962,7 @@ minetest.register_craft( { minetest.register_craft( { output = "signs_lib:sign_wall_white_red 4", recipe = { - { "dye:white", "dye:red", "dye:white" }, + { "hades_dye:white", "hades_dye:red", "hades_dye:white" }, { "hades_core:steel_ingot", "hades_core:steel_ingot", "hades_core:steel_ingot" }, { "", "hades_core:steel_rod", "" } }, @@ -970,7 +970,7 @@ minetest.register_craft( { minetest.register_craft( { output = "signs_lib:sign_wall_white_black 4", recipe = { - { "dye:white", "dye:black", "dye:white" }, + { "hades_dye:white", "hades_dye:black", "hades_dye:white" }, { "hades_core:steel_ingot", "hades_core:steel_ingot", "hades_core:steel_ingot" }, { "", "hades_core:steel_rod", "" } },