Merge pull request 'Dye refactoring; untangle bone meal, lapis, ink sac and cocoa beans from dye items.' (#3176) from redo_dyes into master

Reviewed-on: MineClone2/MineClone2#3176
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>

mods/ENTITIES/mobs_mc/cod.lua

@@ -64,7 +64,7 @@ local cod = {
 		chance = 1,
 		min = 1,
 		max = 1,},
-		{name = "mcl_dye:white",
+		{name = "mcl_bone_meal:bone_meal",
 		chance = 20,
 		min = 1,
 		max = 1,},

mods/ENTITIES/mobs_mc/salmon.lua

@@ -42,7 +42,7 @@ local salmon = {
 		chance = 1,
 		min = 1,
 		max = 1,},
-		{name = "mcl_dye:white",
+		{name = "mcl_bone_meal:bone_meal",
 		chance = 20,
 		min = 1,
 		max = 1,},

mods/ENTITIES/mobs_mc/squid.lua

@@ -40,7 +40,7 @@ mcl_mobs.register_mob("mobs_mc:squid", {
 		run_end = 60,
 	},
     drops = {
-		{name = "mcl_dye:black",
+		{name = "mcl_mobitems:ink_sac",
 		chance = 1,
 		min = 1,
 		max = 3,

mods/ENTITIES/mobs_mc/tropical_fish.lua

@@ -87,7 +87,7 @@ local tropical_fish = {
 		chance = 1,
 		min = 1,
 		max = 1,},
-		{name = "mcl_dye:white",
+		{name = "mcl_bone_meal:bone_meal",
 		chance = 20,
 		min = 1,
 		max = 1,},

mods/ENTITIES/mobs_mc/villager.lua

@@ -479,7 +479,7 @@ local professions = {
 			},
 			{
 			{ { "mcl_core:gold_ingot", 3, 3 }, E1 },
-			{ E1, { "mcl_dye:blue", 1, 1 } },
+			{ E1, { "mcl_core:lapis", 1, 1 } },
 			},
 			{
 			{ { "mcl_mobitems:rabbit_foot", 2, 2 }, E1 },

mods/ITEMS/mcl_cocoas/init.lua

@@ -62,8 +62,6 @@ function mcl_cocoas.grow(pos)
 	return false
 end
 
--- Note: cocoa beans are implemented as mcl_dye:brown
-
 -- Cocoa definition
 -- 1st stage
 local crop_def = {
@@ -78,7 +76,7 @@ local crop_def = {
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	walkable = true,
-	drop = "mcl_dye:brown",
+	drop = "mcl_cocoas:cocoa_beans",
 	collision_box = {
 		type = "fixed",
 		fixed = {
@@ -142,9 +140,20 @@ crop_def.selection_box = {
 		{-0.25, -0.3125, -0.0625, 0.25, 0.5, 0.5},
 	},
 }
-crop_def.drop = "mcl_dye:brown 3"
+crop_def.drop = "mcl_cocoas:cocoa_beans 3"
 minetest.register_node("mcl_cocoas:cocoa_3", table.copy(crop_def))
 
+minetest.register_craftitem("mcl_cocoas:cocoa_beans", {
+	description = S("Cocoa Beans"),
+	_tt_help = S("Grows at the side of jungle trees"),
+	_doc_items_longdesc = S("Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye."),
+	_doc_items_usagehelp = S("Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa."),
+	inventory_image = "mcl_cocoas_cocoa_beans.png",
+	groups = {craftitem = 1, compostability = 65},
+	on_place = function(itemstack, placer, pointed_thing)
+		return cocoa_place(itemstack, placer, pointed_thing, "mcl_cocoas:cocoa_1")
+	end,
+})
 
 minetest.register_abm({
 		label = "Cocoa pod growth",

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.de.tr

@@ -1,4 +1,8 @@
 # textdomain: mcl_cocoas
+Cocoa Beans=Kakaobohnen
+Grows at the side of jungle trees=Wächst an der Seite von Dschungelbäumen
+Cocoa beans can be used to plant cocoa pods, bake chocolate cookies or craft brown dye.=Kakaobohnen können benutzt werden, um Kakao anzupflanzen, Kekse zu backen oder braune Farbstoffe herzustellen.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Rechtsklicken Sie an die Seite eines Dschungelbaumstamms (Dschungelholz), um eine junge Kakaoschote zu pflanzen.
 Premature Cocoa Pod=Junge Kakaoschote
 Cocoa pods grow on the side of jungle trees in 3 stages.=Kakaoschoten wachsen an der Seite von Dschungelbäumen in 3 Stufen.
 Medium Cocoa Pod=Mittelgroße Kakaoschote

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.es.tr

@@ -1,4 +1,8 @@
 # textdomain: mcl_cocoas
+Cocoa Beans=Granos de cacao
+Grows at the side of jungle trees=Crece al lado de los árboles de la jungla
+Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Los granos de cacao se pueden usar para plantar cacao, hornear galletas o hacer tintes marrones.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Haga clic derecho en el costado del tronco de un árbol de la jungla para plantar un cacao joven.
 Premature Cocoa Pod=Vaina de cacao prematura
 Cocoa pods grow on the side of jungle trees in 3 stages.=Las vainas de cacao crecen al lado de los árboles de jungla en 3 etapas.
 Medium Cocoa Pod=Vaina de cacao mediana

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.fr.tr

@@ -1,4 +1,8 @@
 # textdomain: mcl_cocoas
+Cocoa Beans=Fèves de Cacao
+Grows at the side of jungle trees=Pousse à côté des arbres de la jungle
+Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Les fèves de cacao peuvent être utilisées pour planter du cacao, faire des biscuits ou fabriquer de la teinture brune.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Clic droit sur le côté d'un tronc d'arbre de la jungle (Bois Acajou) pour planter un jeune cacaoyer.
 Premature Cocoa Pod=Gousse de cacao prématurée
 Cocoa pods grow on the side of jungle trees in 3 stages.=Les cabosses de cacao poussent sur le côté des arbres d'Acajou en 3 étapes.
 Medium Cocoa Pod=Gousse de cacao moyenne

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.pl.tr

@@ -1,4 +1,8 @@
 # textdomain: mcl_cocoas
+Cocoa Beans=Ziarna kakaowe
+Grows at the side of jungle trees=Rośnie na boku tropikalnych drzew
+Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Ziarna kakaowe mogą być używane do sadzenia kakao, pieczenia ciasteczek lub robienia brązowego barwnika.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Naciśnij prawym na boku tropikalnego pnia (Tropikalne drewno) aby zasadzić młode kakao.
 Premature Cocoa Pod=Niedojrzała roślina kakao
 Cocoa pods grow on the side of jungle trees in 3 stages.=Roślina kakao rośnie na bokach tropikalnych drzew w 3 etapach
 Medium Cocoa Pod=Średnio-dojrzała roślina kakao

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.ru.tr

@@ -1,4 +1,8 @@
 # textdomain: mcl_cocoas
+Cocoa Beans=Какао-бобы
+Grows at the side of jungle trees=Растут на стволах деревьев джунглей
+Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=Какао-бобы можно использовать для посадки какао, выпечки печенья или изготовления коричневого красителя.
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=Кликните правой по боковой части ствола дерева джунглей, чтобы посадить молодое какао.
 Premature Cocoa Pod=Молодой стручок какао
 Cocoa pods grow on the side of jungle trees in 3 stages.=Стручки какао растут на деревьях джунглей в 3 этапа.
 Medium Cocoa Pod=Средний стручок какао

mods/ITEMS/mcl_cocoas/locale/mcl_cocoas.zh_TW.tr

@@ -1,4 +1,8 @@
 # textdomain: mcl_cocoas
+Cocoa Beans=可可豆
+Grows at the side of jungle trees=在叢林木側生長
+Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=可可豆可用於種植可可、烘烤餅乾或製作棕色染料。
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=右鍵點擊叢林木的一側，可以種植一個可可。
 Premature Cocoa Pod=成長中的可可豆莢（第1階段）
 Cocoa pods grow on the side of jungle trees in 3 stages.=可可莢果分3個階段生長在叢林樹的側面。
 Medium Cocoa Pod=成長中的可可豆莢（第2階段）

mods/ITEMS/mcl_cocoas/locale/template.txt

@@ -1,4 +1,8 @@
 # textdomain: mcl_cocoas
+Cocoa Beans=
+Grows at the side of jungle trees=
+Cocoa beans can be used to plant cocoa, bake cookies or craft brown dye.=
+Right click on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa.=
 Premature Cocoa Pod=
 Cocoa pods grow on the side of jungle trees in 3 stages.=
 Medium Cocoa Pod=

mods/ITEMS/mcl_composters/init.lua

@@ -138,8 +138,8 @@ local function composter_harvest(pos, node, player, itemstack, pointed_thing)
 	end
 	-- reset ready type composter to empty type
 	swap_node(pos, {name="mcl_composters:composter"})
-	-- spawn bone meal item (wtf dye?! is this how they make white cocoa)
-	add_item(pos, "mcl_dye:white")
+	-- spawn bone meal item
+	add_item(pos, "mcl_bone_meal:bone_meal")
 	-- TODO play some sounds
 	return itemstack
 end

mods/ITEMS/mcl_core/crafting.lua

@@ -126,14 +126,14 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_core:bone_block",
 	recipe = {
-		{ "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" },
+		{ "mcl_bone_meal:bone_meal", "mcl_bone_meal:bone_meal", "mcl_bone_meal:bone_meal" },
+		{ "mcl_bone_meal:bone_meal", "mcl_bone_meal:bone_meal", "mcl_bone_meal:bone_meal" },
+		{ "mcl_bone_meal:bone_meal", "mcl_bone_meal:bone_meal", "mcl_bone_meal:bone_meal" },
 	},
 })
 
 minetest.register_craft({
-	output = "mcl_dye:white 9",
+	output = "mcl_bone_meal:bone_meal 9",
 	recipe = {
 		{ "mcl_core:bone_block" },
 	},
@@ -298,14 +298,14 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_core:lapisblock",
 	recipe = {
-		{"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"},
+		{"mcl_core:lapis", "mcl_core:lapis", "mcl_core:lapis"},
+		{"mcl_core:lapis", "mcl_core:lapis", "mcl_core:lapis"},
+		{"mcl_core:lapis", "mcl_core:lapis", "mcl_core:lapis"},
 	}
 })
 
 minetest.register_craft({
-	output = "mcl_dye:blue 9",
+	output = "mcl_core:lapis 9",
 	recipe = {
 		{"mcl_core:lapisblock"},
 	}
@@ -482,7 +482,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "cooking",
-	output = "mcl_dye:blue",
+	output = "mcl_core:lapis",
 	recipe = "mcl_core:stone_with_lapis",
 	cooktime = 10,
 })

mods/ITEMS/mcl_core/craftitems.lua

@@ -101,6 +101,14 @@ minetest.register_craftitem("mcl_core:emerald", {
 	groups = { craftitem=1 },
 })
 
+minetest.register_craftitem("mcl_core:lapis", {
+	description = S("Lapis Lazuli"),
+	_doc_items_longdesc = S("Lapis Lazuli are required for enchanting items on an enchanting table."),
+	inventory_image = "mcl_core_lapis.png",
+	stack_max = 64,
+	groups = { craftitem=1 },
+})
+
 minetest.register_craftitem("mcl_core:brick", {
 	description = S("Brick"),
 	_doc_items_longdesc = S("Bricks are used to craft brick blocks."),

mods/ITEMS/mcl_core/locale/mcl_core.de.tr

@@ -130,6 +130,8 @@ Jungle Wood=Dschungelholz
 Jungle Wood Planks=Dschungelholzplanken
 Jungle leaves are grown from jungle trees.=Dschungelblätter wachsen an Dschungelbäumen.
 Ladder=Leiter
+Lapis Lazuli=Lapislazuli
+Lapis Lazuli are required for enchanting items on an enchanting table.=Lapislazuli werden zum Verzaubern von Gegenständen auf einem Zaubertisch benötigt.
 Lapis Lazuli Block=Lapislazuliblock
 Lapis Lazuli Ore=Lapislazulierz
 Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=Lapislazulierz ist das Erz von Lapislazuli. Es kann relativ selten in Ansammlungen in der Nähe des Weltbodens gefunden werden.

mods/ITEMS/mcl_core/locale/mcl_core.es.tr

@@ -130,6 +130,8 @@ Jungle Wood=Tronco de jungla
 Jungle Wood Planks=Madera de jungla
 Jungle leaves are grown from jungle trees.=Las hojas de jungla se cultivan de los árboles de jungla.
 Ladder=Escalera
+Lapis Lazuli=Lapislázuli
+Lapis Lazuli are required for enchanting items on an enchanting table.=Los lapislázuli son necesarios para encantar objetos en una mesa de encantamiento.
 Lapis Lazuli Block=Bloque de lapislázuli
 Lapis Lazuli Ore=Mena de lapislázuli
 Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=El mineral de lapislázuli es el mineral de lapislázuli. Rara vez se puede encontrar en grupos, se encuentra cerca del fondo del mundo.

mods/ITEMS/mcl_core/locale/mcl_core.fr.tr

@@ -130,6 +130,8 @@ Jungle Wood=Bûche d'Acajou
 Jungle Wood Planks=Planches d'Acajou
 Jungle leaves are grown from jungle trees.=Les feuilles d'Acajou sont cultivées à partir d'arbres d'Acajou.
 Ladder=Échelle
+Lapis Lazuli=Lapis Lazuli
+Lapis Lazuli are required for enchanting items on an enchanting table.=Les lapis-lazuli sont nécessaires pour enchanter des objets sur une table d'enchantement.
 Lapis Lazuli Block=Bloc de Lapis-Lazuli
 Lapis Lazuli Ore=Minerai de Lapis-Lazuli
 Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=Le minerai de lapis-lazuli produit du lapis-lazuli. Il peut être rarement trouvé dans des filons près du fond du monde.

mods/ITEMS/mcl_core/locale/mcl_core.pl.tr

@@ -130,6 +130,8 @@ Jungle Wood=Tropikalne drewno
 Jungle Wood Planks=Tropikalne deski
 Jungle leaves are grown from jungle trees.=Tropikalne liście rosną na tropikalnych drzewach.
 Ladder=Drabina
+Lapis Lazuli=Lazuryt
+Lapis Lazuli are required for enchanting items on an enchanting table.=Lapis Lazuli są wymagane do zaklinania przedmiotów na zaklinającym stole.
 Lapis Lazuli Block=Blok lazurytu
 Lapis Lazuli Ore=Ruda lazurytu
 Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=Ruda lazurytu jest rzadko występującym blokiem, który można znaleźć w grupach przy dnie świata.

mods/ITEMS/mcl_core/locale/mcl_core.ru.tr

@@ -130,6 +130,8 @@ Jungle Wood=Дерево джунглей
 Jungle Wood Planks=Доски из дерева джунглей
 Jungle leaves are grown from jungle trees.=Листва дерева джунглей произрастает на деревьях джунглей.
 Ladder=Лестница
+Lapis Lazuli=Ляпис-лазурь
+Lapis Lazuli are required for enchanting items on an enchanting table.=Лазурит требуется для зачарования предметов на столе зачаровывания.
 Lapis Lazuli Block=Ляпис-лазурный блок
 Lapis Lazuli Ore=Ляпис-лазурная руда
 Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=Ляпис-лазурная руда это руда ляпис-лазури. Она изредка встречается в виде скоплений вблизи дна мира.

mods/ITEMS/mcl_core/locale/mcl_core.zh_TW.tr

@@ -129,6 +129,8 @@ Jungle Wood=叢林原木
 Jungle Wood Planks=叢林木材
 Jungle leaves are grown from jungle trees.=叢林樹葉是由叢林樹生長出來的。
 Ladder=梯子
+Lapis Lazuli=青金石
+Lapis Lazuli are required for enchanting items on an enchanting table.=为附魔台上的物品附魔需要青金石。
 Lapis Lazuli Block=青金石磚
 Lapis Lazuli Ore=青金石礦
 Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=青金石礦是青金石的礦石。在世界底部附近能發現成群的和稀有的青金石礦。

mods/ITEMS/mcl_core/locale/template.txt

@@ -130,6 +130,8 @@ Jungle Wood=
 Jungle Wood Planks=
 Jungle leaves are grown from jungle trees.=
 Ladder=
+Lapis Lazuli=
+Lapis Lazuli are required for enchanting items on an enchanting table.=
 Lapis Lazuli Block=
 Lapis Lazuli Ore=
 Lapis lazuli ore is the ore of lapis lazuli. It can be rarely found in clusters near the bottom of the world.=

mods/ITEMS/mcl_core/nodes_base.lua

@@ -187,11 +187,11 @@ minetest.register_node("mcl_core:stone_with_lapis", {
 	drop = {
 		max_items = 1,
 		items = {
-			{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"}},
+			{items = {"mcl_core:lapis 8"},rarity = 5},
+			{items = {"mcl_core:lapis 7"},rarity = 5},
+			{items = {"mcl_core:lapis 6"},rarity = 5},
+			{items = {"mcl_core:lapis 5"},rarity = 5},
+			{items = {"mcl_core:lapis 4"}},
 		}
 	},
 	sounds = mcl_sounds.node_sound_stone_defaults(),

mods/ITEMS/mcl_crimson/init.lua

@@ -82,7 +82,7 @@ minetest.register_node("mcl_crimson:warped_fungus", {
 	},
 	node_placement_prediction = "",
 	on_rightclick = function(pos, node, pointed_thing, player, itemstack)
-		if pointed_thing:get_wielded_item():get_name() == "mcl_dye:white" then
+		if pointed_thing:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
 			local nodepos = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z})
 			if nodepos.name == "mcl_crimson:warped_nylium" or nodepos.name == "mcl_nether:netherrack" then
 				local random = math.random(1, 5)
@@ -129,7 +129,7 @@ minetest.register_node("mcl_crimson:twisting_vines", {
 				itemstack:take_item()
 			end
 			grow_vines(pos, 1, "mcl_crimson:twisting_vines")
-		elseif clicker:get_wielded_item():get_name() == "mcl_dye:white" then
+		elseif clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
 			if not minetest.is_creative_enabled(clicker:get_player_name()) then
 				itemstack:take_item()
 			end
@@ -185,7 +185,7 @@ minetest.register_node("mcl_crimson:weeping_vines", {
 				itemstack:take_item()
 			end
 			grow_vines(pos, 1, "mcl_crimson:weeping_vines", -1)
-		elseif clicker:get_wielded_item():get_name() == "mcl_dye:white" then
+		elseif clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
 			if not minetest.is_creative_enabled(clicker:get_player_name()) then
 				itemstack:take_item()
 			end
@@ -421,7 +421,7 @@ minetest.register_node("mcl_crimson:crimson_fungus", {
 	},
 	node_placement_prediction = "",
 	on_rightclick = function(pos, node, pointed_thing, player)
-		if pointed_thing:get_wielded_item():get_name() == "mcl_dye:white" then
+		if pointed_thing:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
 			local nodepos = minetest.get_node(vector.offset(pos, 0, -1, 0))
 			if nodepos.name == "mcl_crimson:crimson_nylium" or nodepos.name == "mcl_nether:netherrack" then
 				local random = math.random(1, 5)

mods/ITEMS/mcl_deepslate/init.lua

@@ -89,11 +89,11 @@ end
 
 local lapis_drops = {
 	max_items = 1, items = {
-		{ 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" } }
+		{ items = { "mcl_core:lapis 8" }, rarity = 5 },
+		{ items = { "mcl_core:lapis 7" }, rarity = 5 },
+		{ items = { "mcl_core:lapis 6" }, rarity = 5 },
+		{ items = { "mcl_core:lapis 5" }, rarity = 5 },
+		{ items = { "mcl_core:lapis 4" } }
 	}
 }
 
@@ -103,7 +103,7 @@ local deepslate_ores = {
 	{ "Gold", "mcl_raw_ores:raw_gold", "mcl_core:gold_ingot", 4, 0 },
 	{ "Emerald", "mcl_core:emerald", "mcl_core:emerald", 4, 6 },
 	{ "Diamond", "mcl_core:diamond", "mcl_core:diamond", 4, 4 },
-	{ "Lapis Lazuli", lapis_drops, "mcl_dye:blue", 3, 6 },
+	{ "Lapis Lazuli", lapis_drops, "mcl_core:lapis", 3, 6 },
 }
 
 for _, p in pairs(deepslate_ores) do

mods/ITEMS/mcl_dye/init.lua

@@ -18,10 +18,6 @@ local S = minetest.get_translator(minetest.get_current_modname())
 local math = math
 local string = string
 
--- Other mods can use these for looping through available colors
-mcl_dye.basecolors = {"white", "grey", "black", "red", "yellow", "green", "cyan", "blue", "magenta"}
-mcl_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
 -- - basecolor_grey
@@ -62,43 +58,43 @@ mcl_dye.excolors = {"white", "lightgrey", "grey", "darkgrey", "black", "red", "o
 -- - unicolor_medium_<excolor>_s50
 -- - unicolor_dark_<excolor>_s50
 
--- Local stuff
-local dyelocal = {}
-
 -- This collection of colors is partly a historic thing, partly something else.
-dyelocal.dyes = {
-	{"white", "mcl_dye_white",	    S("Bone Meal"),     {dye=1, craftitem=1, basecolor_white=1,   excolor_white=1,     unicolor_white=1}},
-	{"grey", "dye_grey",      	    S("Light Grey Dye"),      {dye=1, craftitem=1, basecolor_grey=1,    excolor_grey=1,      unicolor_grey=1}},
-	{"dark_grey", "dye_dark_grey", 	    S("Grey Dye"), {dye=1, craftitem=1, basecolor_grey=1,    excolor_darkgrey=1,  unicolor_darkgrey=1}},
-	{"black", "mcl_dye_black",     	    S("Ink Sac"),     {dye=1, craftitem=1, basecolor_black=1,   excolor_black=1,     unicolor_black=1}},
-	{"violet", "dye_violet",    	    S("Purple Dye"),    {dye=1, craftitem=1, basecolor_magenta=1, excolor_violet=1,    unicolor_violet=1}},
-	{"blue", "mcl_dye_blue",      	    S("Lapis Lazuli"),      {dye=1, craftitem=1, basecolor_blue=1,    excolor_blue=1,      unicolor_blue=1}},
-	{"lightblue", "mcl_dye_light_blue", S("Light Blue Dye"),      {dye=1, craftitem=1, basecolor_blue=1,    excolor_blue=1,   unicolor_light_blue=1}},
-	{"cyan", "dye_cyan",      	    S("Cyan Dye"),      {dye=1, craftitem=1, basecolor_cyan=1,    excolor_cyan=1,      unicolor_cyan=1}},
-	{"dark_green", "dye_dark_green",    S("Cactus Green"),{dye=1, craftitem=1, basecolor_green=1,   excolor_green=1,     unicolor_dark_green=1}},
-	{"green", "mcl_dye_lime",           S("Lime Dye"),     {dye=1, craftitem=1, basecolor_green=1,   excolor_green=1,     unicolor_green=1}},
-	{"yellow", "dye_yellow",            S("Dandelion Yellow"),    {dye=1, craftitem=1, basecolor_yellow=1,  excolor_yellow=1,    unicolor_yellow=1}},
-	{"brown", "mcl_dye_brown",          S("Cocoa Beans"),     {dye=1, craftitem=1, basecolor_brown=1,  excolor_orange=1,    unicolor_dark_orange=1, compostability = 65}},
-	{"orange", "dye_orange",            S("Orange Dye"),    {dye=1, craftitem=1, basecolor_orange=1,  excolor_orange=1,    unicolor_orange=1}},
-	{"red", "dye_red",                  S("Rose Red"),       {dye=1, craftitem=1, basecolor_red=1,     excolor_red=1,       unicolor_red=1}},
-	{"magenta", "dye_magenta",          S("Magenta Dye"),   {dye=1, craftitem=1, basecolor_magenta=1, excolor_red_violet=1,unicolor_red_violet=1}},
-	{"pink", "dye_pink",                S("Pink Dye"),      {dye=1, craftitem=1, basecolor_red=1,     excolor_red=1,       unicolor_light_red=1}},
+local dyes = {
+	{"white",	S("White Dye"),		{basecolor_white=1,   excolor_white=1,     unicolor_white=1}},
+	{"grey",	S("Light Grey Dye"),	{basecolor_grey=1,    excolor_grey=1,      unicolor_grey=1}},
+	{"dark_grey",	S("Grey Dye"),		{basecolor_grey=1,    excolor_darkgrey=1,  unicolor_darkgrey=1}},
+	{"black",	S("Black Dye"),		{basecolor_black=1,   excolor_black=1,     unicolor_black=1}},
+	{"violet",	S("Purple Dye"),	{basecolor_magenta=1, excolor_violet=1,    unicolor_violet=1}},
+	{"blue",	S("Blue Dye"),		{basecolor_blue=1,    excolor_blue=1,      unicolor_blue=1}},
+	{"lightblue",	S("Light Blue Dye"),	{basecolor_blue=1,    excolor_blue=1,      unicolor_light_blue=1}},
+	{"cyan",	S("Cyan Dye"),		{basecolor_cyan=1,    excolor_cyan=1,      unicolor_cyan=1}},
+	{"dark_green",	S("Cactus Green"),	{basecolor_green=1,   excolor_green=1,     unicolor_dark_green=1}},
+	{"green",	S("Lime Dye"),		{basecolor_green=1,   excolor_green=1,     unicolor_green=1}},
+	{"yellow",	S("Dandelion Yellow"),	{basecolor_yellow=1,  excolor_yellow=1,    unicolor_yellow=1}},
+	{"brown",	S("Brown Dye"),		{basecolor_brown=1,   excolor_orange=1,    unicolor_dark_orange=1}},
+	{"orange",	S("Orange Dye"),	{basecolor_orange=1,  excolor_orange=1,    unicolor_orange=1}},
+	{"red",		S("Rose Red"),		{basecolor_red=1,     excolor_red=1,       unicolor_red=1}},
+	{"magenta",	S("Magenta Dye"),	{basecolor_magenta=1, excolor_red_violet=1,unicolor_red_violet=1}},
+	{"pink",	S("Pink Dye"),		{basecolor_red=1,     excolor_red=1,       unicolor_light_red=1}},
 }
 
-local mg_name = minetest.get_mapgen_setting("mg_name")
+-- Other mods can use these for looping through available colors
+mcl_dye.basecolors = {"white", "grey", "black", "magenta", "blue", "cyan", "green", "yellow", "orange", "red", "brown"}
+mcl_dye.excolors = {"white", "grey", "darkgrey", "black", "violet", "blue", "cyan", "green", "yellow", "orange", "red", "red_violet"}
 
-dyelocal.unicolor_to_dye_id = {}
-for d=1, #dyelocal.dyes do
-	for k, _ in pairs(dyelocal.dyes[d][4]) do
+local unicolor_to_dye_id = {}
+for d = 1, #dyes do
+	for k, _ in pairs(dyes[d][3]) do
 		if string.sub(k, 1, 9) == "unicolor_" then
-			dyelocal.unicolor_to_dye_id[k] = dyelocal.dyes[d][1]
+			unicolor_to_dye_id[k] = dyes[d][1]
 		end
 	end
 end
 
--- Takes an unicolor group name (e.g. “unicolor_white”) and returns a corresponding dye name (if it exists), nil otherwise.
+-- Takes an unicolor group name (e.g. “unicolor_white”) and returns a
+-- corresponding dye name (if it exists), nil otherwise.
 function mcl_dye.unicolor_to_dye(unicolor_group)
-	local color = dyelocal.unicolor_to_dye_id[unicolor_group]
+	local color = unicolor_to_dye_id[unicolor_group]
 	if color then
 		return "mcl_dye:" .. color
 	else
@@ -106,28 +102,21 @@ function mcl_dye.unicolor_to_dye(unicolor_group)
 	end
 end
 
--- Define items
-for _, row in ipairs(dyelocal.dyes) do
-	local name = row[1]
-	-- White and brown dyes are defined explicitly below
-	if name ~= "white" and name ~= "brown" then
-		local img = row[2]
-		local description = row[3]
-		local groups = row[4]
-		local item_name = "mcl_dye:"..name
-		local item_image = img..".png"
-		minetest.register_craftitem(item_name, {
-			inventory_image = item_image,
-			description = description,
+-- Define dye items.
+--
+for _, row in pairs(dyes) do
+	local name, desc, grps = unpack(row)
+	minetest.register_craftitem("mcl_dye:" .. name, {
+		inventory_image = "mcl_dye_" .. name .. ".png",
+		description = desc,
 		_doc_items_longdesc = S("This item is a dye which is used for dyeing and crafting."),
 		_doc_items_usagehelp = S("Rightclick on a sheep to dye its wool. Other things are dyed by crafting."),
-			groups = groups,
-			stack_max = 64,
+		groups = table.update({craftitem = 1, dye = 1}, grps)
 	})
 end
-end
 
--- Bone Meal
+-- Bone meal code to be moved into its own mod.
+--
 function mcl_dye.add_bone_meal_particle(pos, def)
 	if not def then
 		def = {}
@@ -381,14 +370,17 @@ end
 
 mcl_dye.apply_bone_meal = apply_bone_meal
 
-minetest.register_craftitem("mcl_dye:white", {
-	inventory_image = "mcl_dye_white.png",
+-- Bone meal item registration.
+--
+-- To be moved into its own mod.
+--
+minetest.register_craftitem(":mcl_bone_meal:bone_meal", {
+	inventory_image = "mcl_bone_meal_bone_meal.png",
 	description = S("Bone Meal"),
 	_tt_help = S("Speeds up plant growth"),
 	_doc_items_longdesc = S("Bone meal is a white dye and also useful as a fertilizer to speed up the growth of many plants."),
 	_doc_items_usagehelp = S("Rightclick a sheep to turn its wool white. Rightclick a plant to speed up its growth. Note that not all plants can be fertilized like this. When you rightclick a grass block, tall grass and flowers will grow all over the place."),
 	stack_max = 64,
-	groups = dyelocal.dyes[1][4],
 	on_place = function(itemstack, user, pointed_thing)
 		-- Use pointed node's on_rightclick function first, if present
 		local node = minetest.get_node(pointed_thing.under)
@@ -421,55 +413,160 @@ minetest.register_craftitem("mcl_dye:white", {
 	_dispense_into_walkable = true
 })
 
-minetest.register_craftitem("mcl_dye:brown", {
-	inventory_image = "mcl_dye_brown.png",
-	_tt_help = S("Grows at the side of jungle trees"),
-	_doc_items_longdesc = S("Cocoa beans are a brown dye and can be used to plant cocoas."),
-	_doc_items_usagehelp = S("Rightclick a sheep to turn its wool brown. Rightclick on the side of a jungle tree trunk (Jungle Wood) to plant a young cocoa."),
-	description = S("Cocoa Beans"),
-	stack_max = 64,
-	groups = dyelocal.dyes[12][4],
-	on_place = function(itemstack, placer, pointed_thing)
-		return mcl_cocoas.place(itemstack, placer, pointed_thing, "mcl_cocoas:cocoa_1")
-	end,
+minetest.register_craft({
+	output = "mcl_bone_meal:bone_meal 3",
+	recipe = {{"mcl_mobitems:bone"}},
 })
 
--- Dye mixing
+
+-- Dye creation recipes.
+--
+minetest.register_craft({
+	output = "mcl_dye:white",
+	recipe = {{"mcl_bone_meal:bone_meal"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:black",
+	recipe = {{"mcl_mobitems:ink_sac"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:yellow",
+	recipe = {{"mcl_flowers:dandelion"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:yellow 2",
+	recipe = {{"mcl_flowers:sunflower"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:blue",
+	recipe = {{"mcl_core:lapis"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:lightblue",
+	recipe = {{"mcl_flowers:blue_orchid"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:grey",
+	recipe = {{"mcl_flowers:azure_bluet"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:grey",
+	recipe = {{"mcl_flowers:oxeye_daisy"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:grey",
+	recipe = {{"mcl_flowers:tulip_white"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:magenta",
+	recipe = {{"mcl_flowers:allium"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:magenta 2",
+	recipe = {{"mcl_flowers:lilac"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:orange",
+	recipe = {{"mcl_flowers:tulip_orange"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:brown",
+	recipe = {{"mcl_cocoas:cocoa_beans"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:pink",
+	recipe = {{"mcl_flowers:tulip_pink"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:pink 2",
+	recipe = {{"mcl_flowers:peony"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:red",
+	recipe = {{"mcl_farming:beetroot_item"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:red",
+	recipe = {{"mcl_flowers:poppy"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:red",
+	recipe = {{"mcl_flowers:tulip_red"}},
+})
+
+minetest.register_craft({
+	output = "mcl_dye:red 2",
+	recipe = {{"mcl_flowers:rose_bush"}},
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "mcl_dye:dark_green",
+	recipe = "mcl_core:cactus",
+	cooktime = 10,
+})
+
+-- Dye mixing recipes.
+--
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:dark_grey 2",
 	recipe = {"mcl_dye:black", "mcl_dye:white"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:lightblue 2",
 	recipe = {"mcl_dye:blue", "mcl_dye:white"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:grey 3",
 	recipe = {"mcl_dye:black", "mcl_dye:white", "mcl_dye:white"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:grey 2",
 	recipe = {"mcl_dye:dark_grey", "mcl_dye:white"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:green 2",
 	recipe = {"mcl_dye:dark_green", "mcl_dye:white"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:magenta 4",
 	recipe = {"mcl_dye:blue", "mcl_dye:white", "mcl_dye:red", "mcl_dye:red"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:magenta 3",
 	recipe = {"mcl_dye:pink", "mcl_dye:red", "mcl_dye:blue"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:magenta 2",
@@ -493,80 +590,34 @@ minetest.register_craft({
 	output = "mcl_dye:violet 2",
 	recipe = {"mcl_dye:blue", "mcl_dye:red"},
 })
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_dye:orange 2",
 	recipe = {"mcl_dye:yellow", "mcl_dye:red"},
 })
 
--- Dye creation
+-- Legacy items grace conversion recipes.
+--
+-- These allow for retrieval of precious items that were converted into
+-- dye items after refactoring of the dyes.  Should be removed again in
+-- the near future.
 minetest.register_craft({
-	output = "mcl_dye:yellow",
-	recipe = {{"mcl_flowers:dandelion"}},
+	output = "mcl_bone_meal:bone_meal",
+	recipe = {{"mcl_dye:white"}},
 })
+
 minetest.register_craft({
-	output = "mcl_dye:yellow 2",
-	recipe = {{"mcl_flowers:sunflower"}},
+	output = "mcl_mobitems:ink_sac",
+	recipe = {{"mcl_dye:black"}},
 })
+
 minetest.register_craft({
-	output = "mcl_dye:lightblue",
-	recipe = {{"mcl_flowers:blue_orchid"}},
+	output = "mcl_core:lapis",
+	recipe = {{"mcl_dye:blue"}},
 })
+
 minetest.register_craft({
-	output = "mcl_dye:grey",
-	recipe = {{"mcl_flowers:azure_bluet"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:grey",
-	recipe = {{"mcl_flowers:oxeye_daisy"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:grey",
-	recipe = {{"mcl_flowers:tulip_white"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:magenta",
-	recipe = {{"mcl_flowers:allium"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:magenta 2",
-	recipe = {{"mcl_flowers:lilac"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:orange",
-	recipe = {{"mcl_flowers:tulip_orange"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:pink",
-	recipe = {{"mcl_flowers:tulip_pink"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:pink 2",
-	recipe = {{"mcl_flowers:peony"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:red",
-	recipe = {{"mcl_farming:beetroot_item"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:red",
-	recipe = {{"mcl_flowers:poppy"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:red",
-	recipe = {{"mcl_flowers:tulip_red"}},
-})
-minetest.register_craft({
-	output = "mcl_dye:red 2",
-	recipe = {{"mcl_flowers:rose_bush"}},
-})
-minetest.register_craft({
-	type = "cooking",
-	output = "mcl_dye:dark_green",
-	recipe = "mcl_core:cactus",
-	cooktime = 10,
-})
-minetest.register_craft({
-	output = "mcl_dye:white 3",
-	recipe = {{"mcl_mobitems:bone"}},
+	output = "mcl_cocoas:cocoa_beans",
+	recipe = {{"mcl_dye:brown"}},
 })

mods/ITEMS/mcl_dye/locale/mcl_dye.de.tr

@@ -1,16 +1,16 @@
 # textdomain: mcl_dye
-Bone Meal=Knochenmehl
+White Dye=Weißer Farbstoff
 Light Grey Dye=Hellgrauer Farbstoff
 Grey Dye=Grauer Farbstoff
-Ink Sac=Tintenbeutel
+Black Dye=Schwarzer Farbstoff
 Purple Dye=Violetter Farbstoff
-Lapis Lazuli=Lapislazuli
+Blue Dye=Blaue Farbstoff
 Light Blue Dye=Hellblauer Farbstoff
 Cyan Dye=Türkiser Farbstoff
 Cactus Green=Kaktusgrün
 Lime Dye=Lindgrüner Farbstoff
 Dandelion Yellow=Löwenzahngelb
-Cocoa Beans=Kakaobohnen
+Brown Dye=Brauner Farbstoff
 Orange Dye=Orange Farbstoff
 Rose Red=Rosenrot
 Magenta Dye=Magenta Farbstoff

mods/ITEMS/mcl_dye/locale/mcl_dye.es.tr

@@ -1,16 +1,16 @@
 # textdomain: mcl_dye
-Bone Meal=Harina de hueso
+White Dye=Tinte blanca
 Light Grey Dye=Tinte gris claro
 Grey Dye=Tinte gris
-Ink Sac=Saco de tinta
+Black Dye=Tinte negro
 Purple Dye=Tinte púrpura
-Lapis Lazuli=Lapislázuli
+Blue Dye=Tinte azul
 Light Blue Dye=Tinte azul claro
 Cyan Dye=Tinte cian
 Cactus Green=Tinte verde
 Lime Dye=Tinte amarillo verdoso
 Dandelion Yellow=Tinte amarillo
-Cocoa Beans=Granos de cacao
+Brown Dye=Tinte marrón
 Orange Dye=Tinte naranja
 Rose Red=Tinte rojo
 Magenta Dye=Tinte magenta

mods/ITEMS/mcl_dye/locale/mcl_dye.fr.tr

@@ -1,16 +1,16 @@
 # textdomain: mcl_dye
-Bone Meal=Poudre d'Os
+White Dye=Teinture Blanche
 Light Grey Dye=Teinture Gris Clair
 Grey Dye=Teinture Gris
-Ink Sac=Poche d'Encre
+Black Dye=Teinture Noire
 Purple Dye=Teinture Violette
-Lapis Lazuli=Lapis Lazuli
+Blue Dye=Teinture Bleu
 Light Blue Dye=Teinture Bleu Clair
 Cyan Dye=Teinture Cyan
 Cactus Green=Cactus Vert
 Lime Dye=Teinture Vert Clair
 Dandelion Yellow=Teinture Jaune
-Cocoa Beans=Fèves de Cacao
+Brown Dye=Teinture Marron
 Orange Dye=Teinture Orange
 Rose Red=Teinture Rouge
 Magenta Dye=Teinture Magenta

mods/ITEMS/mcl_dye/locale/mcl_dye.pl.tr

@@ -1,16 +1,16 @@
 # textdomain: mcl_dye
-Bone Meal=Mączka kostna
+White Dye=Biały farba
 Light Grey Dye=Jasnoszara farba
 Grey Dye=Szara farba
-Ink Sac=Torbiel z atramentem
+Black Dye=Czarny farba
 Purple Dye=Fioletowa farba
-Lapis Lazuli=Lazuryt
+Blue Dye=Niebieska farba
 Light Blue Dye=Jasnoniebieska farba
 Cyan Dye=Błękitna farba
 Cactus Green=Kaktusowa zieleń
 Lime Dye=Jasnozielona farba
 Dandelion Yellow=Mleczowy żółty
-Cocoa Beans=Ziarna kakaowe
+Brown Dye=Brązowy farba
 Orange Dye=Pomarańczowa farba
 Rose Red=Różany czerwony
 Magenta Dye=Karmazynowa farba

mods/ITEMS/mcl_dye/locale/mcl_dye.ru.tr

@@ -1,16 +1,16 @@
 # textdomain: mcl_dye
-Bone Meal=Костная мука
+White Dye=Белый краситель
 Light Grey Dye=Светло-серый краситель
 Grey Dye=Серый краситель
-Ink Sac=Чернильный мешок
+Black Dye=Чёрный краситель
 Purple Dye=Пурпурный краситель
-Lapis Lazuli=Ляпис-лазурь
+Blue Dye=голубой краситель
 Light Blue Dye=Светло-голубой краситель
 Cyan Dye=Голубой краситель
 Cactus Green=Зелень кактуса
 Lime Dye=Зелёный лаймовый краситель
 Dandelion Yellow=Одуванчиковый жёлтый краситель
-Cocoa Beans=Какао-бобы
+Brown Dye=Коричневый краситель
 Orange Dye=Оранжевый краситель
 Rose Red=Экстракт красной розы
 Magenta Dye=Фиолетовый краситель

mods/ITEMS/mcl_dye/locale/mcl_dye.zh_TW.tr

@@ -1,16 +1,16 @@
 # textdomain: mcl_dye
-Bone Meal=骨粉
+White Dye=白色染料
 Light Grey Dye=淺灰色染料
 Grey Dye=灰色染料
-Ink Sac=墨囊
+Black Dye=黑色染料
 Purple Dye=紫色染料
-Lapis Lazuli=青金石
+Blue Dye=藍色染料
 Light Blue Dye=淺藍色染料
 Cyan Dye=青色染料
 Cactus Green=仙人掌綠
 Lime Dye=淺綠色染料
 Dandelion Yellow=蒲公英黃
-Cocoa Beans=可可豆
+Brown Dye=棕色染料
 Orange Dye=橙色染料
 Rose Red=玫瑰紅
 Magenta Dye=洋紅色染料

mods/ITEMS/mcl_dye/locale/template.txt

@@ -1,16 +1,16 @@
 # textdomain: mcl_dye
-Bone Meal=
+White Dye=
 Light Grey Dye=
 Grey Dye=
-Ink Sac=
+Black Dye=
 Purple Dye=
-Lapis Lazuli=
+Blue Dye=
 Light Blue Dye=
 Cyan Dye=
 Cactus Green=
 Lime Dye=
 Dandelion Yellow=
-Cocoa Beans=
+Brown Dye=
 Orange Dye=
 Rose Red=
 Magenta Dye=

mods/ITEMS/mcl_enchanting/engine.lua

@@ -520,7 +520,7 @@ function mcl_enchanting.show_enchanting_formspec(player)
 	local table_slots = mcl_enchanting.get_table_slots(player, itemstack, num_bookshelves)
 	for i, slot in ipairs(table_slots) do
 		any_enchantment = any_enchantment or slot
-		local enough_lapis = inv:contains_item("enchanting_lapis", ItemStack({name = "mcl_dye:blue", count = i}))
+		local enough_lapis = inv:contains_item("enchanting_lapis", ItemStack({name = "mcl_core:lapis", count = i}))
 		local enough_levels = slot and slot.level_requirement <= player_levels
 		local can_enchant = (slot and enough_lapis and enough_levels)
 		local ending = (can_enchant and "" or "_off")
@@ -555,7 +555,7 @@ function mcl_enchanting.handle_formspec_fields(player, formname, fields)
 		local meta = player:get_meta()
 		local num_bookshelfes = meta:get_int("mcl_enchanting:num_bookshelves")
 		local itemstack = inv:get_stack("enchanting_item", 1)
-		local cost = ItemStack({name = "mcl_dye:blue", count = button_pressed})
+		local cost = ItemStack({name = "mcl_core:lapis", count = button_pressed})
 		if not inv:contains_item("enchanting_lapis", cost) then
 			return
 		end
@@ -608,7 +608,7 @@ function mcl_enchanting.allow_inventory_action(player, action, inventory, invent
 		if action == "move" then
 			local listname = inventory_info.to_list
 			local stack = inventory:get_stack(inventory_info.from_list, inventory_info.from_index)
-			if stack:get_name() == "mcl_dye:blue" and listname ~= "enchanting_item" then
+			if stack:get_name() == "mcl_core:lapis" and listname ~= "enchanting_item" then
 				local count = stack:get_count()
 				local old_stack = inventory:get_stack("enchanting_lapis", 1)
 				if old_stack:get_name() ~= "" then
@@ -631,7 +631,7 @@ function mcl_enchanting.on_inventory_action(player, action, inventory, inventory
 		if action == "move" and inventory_info.to_list == "enchanting" then
 			local stack = inventory:get_stack("enchanting", 1)
 			local result_list
-			if stack:get_name() == "mcl_dye:blue" then
+			if stack:get_name() == "mcl_core:lapis" then
 				result_list = "enchanting_lapis"
 				stack:add_item(inventory:get_stack("enchanting_lapis", 1))
 			else

mods/ITEMS/mcl_farming/sweet_berry.lua

@@ -41,7 +41,7 @@ for i=0, 3 do
 				minetest.record_protection_violation(pos, pn)
 				return itemstack
 			end
-			if mcl_dye and clicker:get_wielded_item():get_name() == "mcl_dye:white" then
+			if mcl_dye and clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
 				mcl_dye.apply_bone_meal({under=pos},clicker)
 				itemstack:take_item()
 				return

mods/ITEMS/mcl_farming/wheat.lua

@@ -117,7 +117,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_farming:cookie 8",
 	recipe = {
-		{"mcl_farming:wheat_item", "mcl_dye:brown", "mcl_farming:wheat_item"},
+		{"mcl_farming:wheat_item", "mcl_cocoas:cocoa_beans", "mcl_farming:wheat_item"},
 	}
 })
 

mods/ITEMS/mcl_fishing/init.lua

@@ -89,7 +89,7 @@ local fish = function(itemstack, player, pointed_thing)
 										{ itemstring = "mcl_mobitems:string", weight = 5 },
 										{ itemstring = "mcl_potions:water", weight = 10 },
 										{ itemstring = "mcl_mobitems:bone", weight = 10 },
-										{ itemstring = "mcl_dye:black", weight = 1, amount_min = 10, amount_max = 10 },
+										{ itemstring = "mcl_mobitems:ink_sac", weight = 1, amount_min = 10, amount_max = 10 },
 										{ itemstring = "mcl_mobitems:string", weight = 10 }, -- TODO: Tripwire Hook
 									},
 									stacks_min = 1,

mods/ITEMS/mcl_hoppers/init.lua

@@ -612,7 +612,7 @@ if minetest.get_modpath("mcl_composters") then
 
 				minetest.swap_node(uppos, {name = "mcl_composters:composter"})
 
-				inv:add_item("main", "mcl_dye:white")
+				inv:add_item("main", "mcl_bone_meal:bone_meal")
 			end
 		end,
 	})

mods/ITEMS/mcl_mobitems/init.lua

@@ -181,6 +181,14 @@ minetest.register_craftitem("mcl_mobitems:bone", {
 	_mcl_toollike_wield = true,
 })
 
+minetest.register_craftitem("mcl_mobitems:ink_sac", {
+	description = S("Squid Ink Sac"),
+	_doc_items_longdesc = S("This item is dropped by dead squids. Squid ink can be used to as an ingredient to craft book and quill or black dye."),
+	inventory_image = "mcl_mobitems_ink_sac.png",
+	stack_max = 64,
+	groups = { craftitem = 1 },
+})
+
 minetest.register_craftitem("mcl_mobitems:string",{
 	description = S("String"),
 	_doc_items_longdesc = S("Strings are used in crafting."),

mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.de.tr

@@ -52,6 +52,9 @@ Bones can be used to tame wolves so they will protect you. They are also useful
 
 Wield the bone near wolves to attract them. Use the “Place” key on the wolf to give it a bone and tame it. You can then give commands to the tamed wolf by using the “Place” key on it.=Halten Sie den Knochen in der Nähe von Wölfen, um sie anzulocken. Benutzen Sie die „Platzieren“-Taste auf dem Wolf, um ihm den Knochen zu geben und ihn zu zähmen. Sie können dem gezähmten Wolf Befehle erteilen, indem Sie die „Platzieren“-Taste auf ihm benutzen.
 
+Squid Ink Sac=Tintenbeutel
+This item is dropped by dead squids.  Squid ink can be used to as an ingredient to craft book and quill or black dye.=Dieser Gegenstand wird von toten Tintenfischen abgeworfen.  Tintenbeutel können benutzt werden, um Buch und Feder oder schwarzen Farbstoff zu fertigen.
+
 String=Faden
 Strings are used in crafting.=Fäden sind nützlich in der Fertigung.
 Blaze Rod=Lohenrute

mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.es.tr

@@ -52,6 +52,9 @@ Bones can be used to tame wolves so they will protect you. They are also useful
 
 Wield the bone near wolves to attract them. Use the “Place” key on the wolf to give it a bone and tame it. You can then give commands to the tamed wolf by using the “Place” key on it.=Empuña el hueso cerca de los lobos para atraerlos. Usa la tecla "Colocar" en el lobo para darle un hueso y domesticarlo. Luego puede dar órdenes al lobo domesticado utilizando la tecla "Colocar".
 
+Squid Ink Sac=Saco de tinta
+This item is dropped by dead squids.  Squid ink can be used to as an ingredient to craft book and quill or black dye.=
+
 String=Cuerda
 Strings are used in crafting.=Las cuerdas se usan en la elaboración.
 Blaze Rod=Vara de blaze

mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr

@@ -52,6 +52,9 @@ Bones can be used to tame wolves so they will protect you. They are also useful
 
 Wield the bone near wolves to attract them. Use the “Place” key on the wolf to give it a bone and tame it. You can then give commands to the tamed wolf by using the “Place” key on it.=Maniez l'os près des loups pour les attirer. Utilisez la touche «Placer» sur le loup pour lui donner un os et l'apprivoiser. Vous pouvez ensuite donner des commandes au loup apprivoisé en utilisant la touche "Placer" sur celui-ci.
 
+Squid Ink Sac=Poche d'encre
+This item is dropped by dead squids.  Squid ink can be used to as an ingredient to craft book and quill or black dye.=
+
 String=Ficelle
 Strings are used in crafting.=Les ficelles sont utilisées dans l'artisanat.
 Blaze Rod=Bâton de Blaze

mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.pl.tr

@@ -53,6 +53,9 @@ Bones can be used to tame wolves so they will protect you. They are also useful
 
 Wield the bone near wolves to attract them. Use the “Place” key on the wolf to give it a bone and tame it. You can then give commands to the tamed wolf by using the “Place” key on it.=Trzymaj kość w pobliżu wilków aby je zwabić. Użyj przycisku "Umieść" na wilku aby dać mu kość i go oswoić. Możesz wtedy wydawać polecenia oswojonemu wilkowi klikając przycisk "Umieść" na nim.
 
+Squid Ink Sac=Torbiel z atramentem
+This item is dropped by dead squids.  Squid ink can be used to as an ingredient to craft book and quill or black dye.=
+
 String=Nić
 Strings are used in crafting.=Nić jest użyteczna w wytwarzaniu.
 Blaze Rod=Płomienna różdżka

mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.ru.tr

@@ -52,6 +52,9 @@ Bones can be used to tame wolves so they will protect you. They are also useful
 
 Wield the bone near wolves to attract them. Use the “Place” key on the wolf to give it a bone and tame it. You can then give commands to the tamed wolf by using the “Place” key on it.=Положите кость рядом с волками, чтобы привлечь их. Используйте клавишу “Разместить” на волке, чтобы дать ему кость и приручить его. Вы можете командовать приручёнными волками с помощью клавиши “Разместить”.
 
+Squid Ink Sac=Чернильный мешок
+This item is dropped by dead squids.  Squid ink can be used to as an ingredient to craft book and quill or black dye.=
+
 String=Нити
 Strings are used in crafting.=Нити используются для крафтинга
 Blaze Rod=Огненный стержень

mods/ITEMS/mcl_mobitems/locale/template.txt

@@ -52,6 +52,9 @@ Bones can be used to tame wolves so they will protect you. They are also useful
 
 Wield the bone near wolves to attract them. Use the “Place” key on the wolf to give it a bone and tame it. You can then give commands to the tamed wolf by using the “Place” key on it.=
 
+Squid Ink Sac=
+This item is dropped by dead squids.  Squid ink can be used to as an ingredient to craft book and quill or black dye.=
+
 String=
 Strings are used in crafting.=
 Blaze Rod=

mods/MAPGEN/mcl_structures/shipwrecks.lua

@@ -149,7 +149,7 @@ mcl_structures.register_structure("shipwreck",{
 				{ itemstring = "mcl_core:iron_ingot", weight = 90, amount_min = 1, amount_max = 5 },
 				{ itemstring = "mcl_core:iron_nugget", weight = 50, amount_min = 1, amount_max = 10 },
 				{ itemstring = "mcl_core:emerald", weight = 40, amount_min = 1, amount_max = 5 },
-				{ itemstring = "mcl_dye:blue", weight = 20, amount_min = 1, amount_max = 10 },
+				{ itemstring = "mcl_core:lapis", weight = 20, amount_min = 1, amount_max = 10 },
 				{ itemstring = "mcl_core:gold_ingot", weight = 10, amount_min = 1, amount_max = 5 },
 				{ itemstring = "mcl_core:gold_nugget", weight = 10, amount_min = 1, amount_max = 10 },
 				{ itemstring = "mcl_experience:bottle", weight = 5, amount_min = 1, amount_max = 1 },

mods/MAPGEN/tsm_railcorridors/gameconfig.lua

@@ -92,7 +92,7 @@ function tsm_railcorridors.get_treasures(pr)
 			{ itemstring = "mcl_farming:melon_seeds", weight = 10, amount_min = 2, amount_max = 4 },
 			{ itemstring = "mcl_farming:pumpkin_seeds", weight = 10, amount_min = 2, amount_max = 4 },
 			{ itemstring = "mcl_core:iron_ingot", weight = 10, amount_min = 1, amount_max = 5 },
-			{ itemstring = "mcl_dye:blue", weight = 5, amount_min = 4, amount_max = 9 },
+			{ itemstring = "mcl_core:lapis", weight = 5, amount_min = 4, amount_max = 9 },
 			{ itemstring = "mesecons:redstone", weight = 5, amount_min = 4, amount_max = 9 },
 			{ itemstring = "mcl_core:gold_ingot", weight = 5, amount_min = 1, amount_max = 3 },
 			{ itemstring = "mcl_core:diamond", weight = 3, amount_min = 1, amount_max = 2 },