From 8417b246b5c7c0bc6e519d78ba40ded4c6ba7873 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 30 Jan 2017 15:33:04 +0100 Subject: [PATCH] Rename dye to mcl_dye --- mods/default/crafting.lua | 24 ++--- mods/default/nodes.lua | 10 +- mods/default/tools.lua | 2 +- mods/farming/wheat.lua | 2 +- mods/hardened_clay/init.lua | 2 +- mods/{dye => mcl_dye}/README.txt | 0 mods/{dye => mcl_dye}/depends.txt | 0 mods/{dye => mcl_dye}/init.lua | 88 +++++++++--------- mods/mcl_dye/mod.conf | 1 + mods/{dye => mcl_dye}/textures/dye_black.png | Bin mods/{dye => mcl_dye}/textures/dye_blue.png | Bin mods/{dye => mcl_dye}/textures/dye_brown.png | Bin mods/{dye => mcl_dye}/textures/dye_cyan.png | Bin .../textures/dye_dark_green.png | Bin .../textures/dye_dark_grey.png | Bin mods/{dye => mcl_dye}/textures/dye_green.png | Bin mods/{dye => mcl_dye}/textures/dye_grey.png | Bin .../textures/dye_lightblue.png | Bin .../{dye => mcl_dye}/textures/dye_magenta.png | Bin mods/{dye => mcl_dye}/textures/dye_orange.png | Bin mods/{dye => mcl_dye}/textures/dye_pink.png | Bin mods/{dye => mcl_dye}/textures/dye_red.png | Bin mods/{dye => mcl_dye}/textures/dye_violet.png | Bin mods/{dye => mcl_dye}/textures/dye_white.png | Bin mods/{dye => mcl_dye}/textures/dye_yellow.png | Bin 25 files changed, 63 insertions(+), 66 deletions(-) rename mods/{dye => mcl_dye}/README.txt (100%) rename mods/{dye => mcl_dye}/depends.txt (100%) rename mods/{dye => mcl_dye}/init.lua (80%) create mode 100644 mods/mcl_dye/mod.conf rename mods/{dye => mcl_dye}/textures/dye_black.png (100%) rename mods/{dye => mcl_dye}/textures/dye_blue.png (100%) rename mods/{dye => mcl_dye}/textures/dye_brown.png (100%) rename mods/{dye => mcl_dye}/textures/dye_cyan.png (100%) rename mods/{dye => mcl_dye}/textures/dye_dark_green.png (100%) rename mods/{dye => mcl_dye}/textures/dye_dark_grey.png (100%) rename mods/{dye => mcl_dye}/textures/dye_green.png (100%) rename mods/{dye => mcl_dye}/textures/dye_grey.png (100%) rename mods/{dye => mcl_dye}/textures/dye_lightblue.png (100%) rename mods/{dye => mcl_dye}/textures/dye_magenta.png (100%) rename mods/{dye => mcl_dye}/textures/dye_orange.png (100%) rename mods/{dye => mcl_dye}/textures/dye_pink.png (100%) rename mods/{dye => mcl_dye}/textures/dye_red.png (100%) rename mods/{dye => mcl_dye}/textures/dye_violet.png (100%) rename mods/{dye => mcl_dye}/textures/dye_white.png (100%) rename mods/{dye => mcl_dye}/textures/dye_yellow.png (100%) diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index e5f8fe469..531c617a1 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -149,18 +149,18 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "dye:bone_block", + output = "mcl_dye:bone_block", recipe = { - { "dye:white", "dye:white", "dye:white" }, - { "dye:white", "dye:white", "dye:white" }, - { "dye:white", "dye:white", "dye:white" }, + { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, + { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, + { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, }, }) minetest.register_craft({ - output = "dye:white 9", + output = "mcl_dye:white 9", recipe = { - { "dye:bone_block" }, + { "mcl_dye:bone_block" }, }, }) @@ -496,7 +496,7 @@ minetest.register_craft({ output = 'default:prismarine_dark', recipe = { {'default:prismarine_shard', 'default:prismarine_shard', 'default:prismarine_shard'}, - {'default:prismarine_shard', 'dye:black', 'default:prismarine_shard'}, + {'default:prismarine_shard', 'mcl_dye:black', 'default:prismarine_shard'}, {'default:prismarine_shard', 'default:prismarine_shard', 'default:prismarine_shard'}, } }) @@ -662,14 +662,14 @@ minetest.register_craft({ minetest.register_craft({ output = 'default:lapisblock', recipe = { - {'dye:blue', 'dye:blue', 'dye:blue'}, - {'dye:blue', 'dye:blue', 'dye:blue'}, - {'dye:blue', 'dye:blue', 'dye:blue'}, + {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, + {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, + {'mcl_dye:blue', 'mcl_dye:blue', 'mcl_dye:blue'}, } }) minetest.register_craft({ - output = 'dye:blue 9', + output = 'mcl_dye:blue 9', recipe = { {'default:lapisblock'}, } @@ -891,7 +891,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", - output = "dye:blue", + output = "mcl_dye:blue", recipe = "default:stone_with_lapis", cooktime = 10, }) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 8a96da821..be09fdc66 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -135,11 +135,11 @@ minetest.register_node("default:stone_with_lapis", { drop = { max_items = 1, items = { - {items = {'dye:blue 8'},rarity = 5}, - {items = {'dye:blue 7'},rarity = 5}, - {items = {'dye:blue 6'},rarity = 5}, - {items = {'dye:blue 5'},rarity = 5}, - {items = {'dye:blue 4'}}, + {items = {'mcl_dye:blue 8'},rarity = 5}, + {items = {'mcl_dye:blue 7'},rarity = 5}, + {items = {'mcl_dye:blue 6'},rarity = 5}, + {items = {'mcl_dye:blue 5'},rarity = 5}, + {items = {'mcl_dye:blue 4'}}, } }, sounds = default.node_sound_stone_defaults(), diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 7d751ac84..61df2930d 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -392,7 +392,7 @@ minetest.register_tool("default:pole", { elseif r <= 72 then itemname = "default:bone" elseif r <= 73 then - itemname = "dye:black" + itemname = "mcl_dye:black" itemcount = 10 else -- TODO: Tripwire hook diff --git a/mods/farming/wheat.lua b/mods/farming/wheat.lua index 5efa4305b..25cb0036b 100644 --- a/mods/farming/wheat.lua +++ b/mods/farming/wheat.lua @@ -141,7 +141,7 @@ minetest.register_craft({ minetest.register_craft({ output = "farming:cookie 8", recipe = { - {'farming:wheat_harvested', 'dye:brown', 'farming:wheat_harvested'}, + {'farming:wheat_harvested', 'mcl_dye:brown', 'farming:wheat_harvested'}, } }) diff --git a/mods/hardened_clay/init.lua b/mods/hardened_clay/init.lua index 37b0d25d8..9c079242c 100644 --- a/mods/hardened_clay/init.lua +++ b/mods/hardened_clay/init.lua @@ -53,7 +53,7 @@ for _, row in ipairs(clay.dyes) do output = 'hardened_clay:'..name..' 8', recipe = { {'hardened_clay:hardened_clay', 'hardened_clay:hardened_clay', 'hardened_clay:hardened_clay'}, - {'hardened_clay:hardened_clay', 'dye:'..craft_color_group, 'hardened_clay:hardened_clay'}, + {'hardened_clay:hardened_clay', 'mcl_dye:'..craft_color_group, 'hardened_clay:hardened_clay'}, {'hardened_clay:hardened_clay', 'hardened_clay:hardened_clay', 'hardened_clay:hardened_clay'}, }, }) diff --git a/mods/dye/README.txt b/mods/mcl_dye/README.txt similarity index 100% rename from mods/dye/README.txt rename to mods/mcl_dye/README.txt diff --git a/mods/dye/depends.txt b/mods/mcl_dye/depends.txt similarity index 100% rename from mods/dye/depends.txt rename to mods/mcl_dye/depends.txt diff --git a/mods/dye/init.lua b/mods/mcl_dye/init.lua similarity index 80% rename from mods/dye/init.lua rename to mods/mcl_dye/init.lua index 4ae56151b..2db0a8219 100644 --- a/mods/dye/init.lua +++ b/mods/mcl_dye/init.lua @@ -86,7 +86,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 = "mcl_dye:"..name local item_image = "dye_"..name..".png" minetest.register_craftitem(item_name, { inventory_image = item_image, @@ -96,7 +96,7 @@ for _, row in ipairs(dyelocal.dyes) do }) end -minetest.register_craftitem("dye:white", { +minetest.register_craftitem("mcl_dye:white", { inventory_image = "dye_white.png", description = "Bone Meal", stack_max = 64, @@ -112,136 +112,132 @@ minetest.register_craftitem("dye:white", { -- Dye mixing minetest.register_craft({ type = "shapeless", - output = "dye:dark_grey 2", - recipe = {"dye:black", "dye:white"}, + output = "mcl_dye:dark_grey 2", + recipe = {"mcl_dye:black", "mcl_dye:white"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:lightblue 2", - recipe = {"dye:blue", "dye:white"}, + output = "mcl_dye:lightblue 2", + recipe = {"mcl_dye:blue", "mcl_dye:white"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:grey 3", - recipe = {"dye:black", "dye:white", "dye:white"}, + output = "mcl_dye:grey 3", + recipe = {"mcl_dye:black", "mcl_dye:white", "mcl_dye:white"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:grey 2", - recipe = {"dye:dark_grey", "dye:white"}, + output = "mcl_dye:grey 2", + recipe = {"mcl_dye:dark_grey", "mcl_dye:white"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:green 2", - recipe = {"dye:dark_green", "dye:white"}, + output = "mcl_dye:green 2", + recipe = {"mcl_dye:dark_green", "mcl_dye:white"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:magenta 4", - recipe = {"dye:blue", "dye:white", "dye:red", "dye:red"}, + output = "mcl_dye:magenta 4", + recipe = {"mcl_dye:blue", "mcl_dye:white", "mcl_dye:red", "mcl_dye:red"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:pink 2", - recipe = {"dye:red", "dye:white"}, + output = "mcl_dye:pink 2", + recipe = {"mcl_dye:red", "mcl_dye:white"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:cyan 2", - recipe = {"dye:blue", "dye:dark_green"}, + output = "mcl_dye:cyan 2", + recipe = {"mcl_dye:blue", "mcl_dye:dark_green"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:violet 2", - recipe = {"dye:blue", "dye:red"}, + output = "mcl_dye:violet 2", + recipe = {"mcl_dye:blue", "mcl_dye:red"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:orange 2", - recipe = {"dye:yellow", "dye:red"}, + output = "mcl_dye:orange 2", + recipe = {"mcl_dye:yellow", "mcl_dye:red"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:magenta 2", - recipe = {"dye:violet", "dye:pink"}, + output = "mcl_dye:magenta 2", + recipe = {"mcl_dye:violet", "mcl_dye:pink"}, }) minetest.register_craft({ type = "shapeless", - output = "dye:magenta 3", - recipe = {"dye:pink", "dye:red", "dye:blue"}, + output = "mcl_dye:magenta 3", + recipe = {"mcl_dye:pink", "mcl_dye:red", "mcl_dye:blue"}, }) -- Dye creation minetest.register_craft({ - output = "dye:yellow", + output = "mcl_dye:yellow", recipe = {{"flowers:dandelion_yellow"}}, }) minetest.register_craft({ - output = "dye:yellow 2", + output = "mcl_dye:yellow 2", recipe = {{"flowers:sunflower"}}, }) minetest.register_craft({ - output = "dye:lightblue", + output = "mcl_dye:lightblue", recipe = {{"flowers:blue_orchid"}}, }) minetest.register_craft({ - output = "dye:grey", + output = "mcl_dye:grey", recipe = {{"flowers:azure_bluet"}}, }) minetest.register_craft({ - output = "dye:grey", + output = "mcl_dye:grey", recipe = {{"flowers:oxeye_daisy"}}, }) minetest.register_craft({ - output = "dye:grey", + output = "mcl_dye:grey", recipe = {{"flowers:tulip_white"}}, }) minetest.register_craft({ - output = "dye:magenta", + output = "mcl_dye:magenta", recipe = {{"flowers:allium"}}, }) minetest.register_craft({ - output = "dye:magenta 2", + output = "mcl_dye:magenta 2", recipe = {{"flowers:lilac"}}, }) minetest.register_craft({ - output = "dye:orange", + output = "mcl_dye:orange", recipe = {{"flowers:tulip_orange"}}, }) minetest.register_craft({ - output = "dye:pink", + output = "mcl_dye:pink", recipe = {{"flowers:tulip_pink"}}, }) minetest.register_craft({ - output = "dye:pink 2", + output = "mcl_dye:pink 2", recipe = {{"flowers:peony"}}, }) minetest.register_craft({ - output = "dye:red", + output = "mcl_dye:red", recipe = {{"flowers:poppy"}}, }) minetest.register_craft({ - output = "dye:red", + output = "mcl_dye:red", recipe = {{"flowers:tulip_red"}}, }) minetest.register_craft({ - output = "dye:red 2", + output = "mcl_dye:red 2", recipe = {{"flowers:rose_bush"}}, }) minetest.register_craft({ type = "cooking", - output = "dye:dark_green", + output = "mcl_dye:dark_green", recipe = "default:cactus", cooktime = 10, }) minetest.register_craft({ - output = "dye:white 3", + output = "mcl_dye:white 3", recipe = {{"default:bone"}}, }) -minetest.register_craft({ - output = "dye:white 9", - recipe = {{"default:boneblock"}}, -}) diff --git a/mods/mcl_dye/mod.conf b/mods/mcl_dye/mod.conf new file mode 100644 index 000000000..356b16434 --- /dev/null +++ b/mods/mcl_dye/mod.conf @@ -0,0 +1 @@ +name = mcl_dye diff --git a/mods/dye/textures/dye_black.png b/mods/mcl_dye/textures/dye_black.png similarity index 100% rename from mods/dye/textures/dye_black.png rename to mods/mcl_dye/textures/dye_black.png diff --git a/mods/dye/textures/dye_blue.png b/mods/mcl_dye/textures/dye_blue.png similarity index 100% rename from mods/dye/textures/dye_blue.png rename to mods/mcl_dye/textures/dye_blue.png diff --git a/mods/dye/textures/dye_brown.png b/mods/mcl_dye/textures/dye_brown.png similarity index 100% rename from mods/dye/textures/dye_brown.png rename to mods/mcl_dye/textures/dye_brown.png diff --git a/mods/dye/textures/dye_cyan.png b/mods/mcl_dye/textures/dye_cyan.png similarity index 100% rename from mods/dye/textures/dye_cyan.png rename to mods/mcl_dye/textures/dye_cyan.png diff --git a/mods/dye/textures/dye_dark_green.png b/mods/mcl_dye/textures/dye_dark_green.png similarity index 100% rename from mods/dye/textures/dye_dark_green.png rename to mods/mcl_dye/textures/dye_dark_green.png diff --git a/mods/dye/textures/dye_dark_grey.png b/mods/mcl_dye/textures/dye_dark_grey.png similarity index 100% rename from mods/dye/textures/dye_dark_grey.png rename to mods/mcl_dye/textures/dye_dark_grey.png diff --git a/mods/dye/textures/dye_green.png b/mods/mcl_dye/textures/dye_green.png similarity index 100% rename from mods/dye/textures/dye_green.png rename to mods/mcl_dye/textures/dye_green.png diff --git a/mods/dye/textures/dye_grey.png b/mods/mcl_dye/textures/dye_grey.png similarity index 100% rename from mods/dye/textures/dye_grey.png rename to mods/mcl_dye/textures/dye_grey.png diff --git a/mods/dye/textures/dye_lightblue.png b/mods/mcl_dye/textures/dye_lightblue.png similarity index 100% rename from mods/dye/textures/dye_lightblue.png rename to mods/mcl_dye/textures/dye_lightblue.png diff --git a/mods/dye/textures/dye_magenta.png b/mods/mcl_dye/textures/dye_magenta.png similarity index 100% rename from mods/dye/textures/dye_magenta.png rename to mods/mcl_dye/textures/dye_magenta.png diff --git a/mods/dye/textures/dye_orange.png b/mods/mcl_dye/textures/dye_orange.png similarity index 100% rename from mods/dye/textures/dye_orange.png rename to mods/mcl_dye/textures/dye_orange.png diff --git a/mods/dye/textures/dye_pink.png b/mods/mcl_dye/textures/dye_pink.png similarity index 100% rename from mods/dye/textures/dye_pink.png rename to mods/mcl_dye/textures/dye_pink.png diff --git a/mods/dye/textures/dye_red.png b/mods/mcl_dye/textures/dye_red.png similarity index 100% rename from mods/dye/textures/dye_red.png rename to mods/mcl_dye/textures/dye_red.png diff --git a/mods/dye/textures/dye_violet.png b/mods/mcl_dye/textures/dye_violet.png similarity index 100% rename from mods/dye/textures/dye_violet.png rename to mods/mcl_dye/textures/dye_violet.png diff --git a/mods/dye/textures/dye_white.png b/mods/mcl_dye/textures/dye_white.png similarity index 100% rename from mods/dye/textures/dye_white.png rename to mods/mcl_dye/textures/dye_white.png diff --git a/mods/dye/textures/dye_yellow.png b/mods/mcl_dye/textures/dye_yellow.png similarity index 100% rename from mods/dye/textures/dye_yellow.png rename to mods/mcl_dye/textures/dye_yellow.png