From 81ea298011ec5d7249fc670eb167711dfa30ba4e Mon Sep 17 00:00:00 2001
From: kabou <noreply@example.org>
Date: Mon, 2 May 2022 22:19:19 +0200
Subject: [PATCH] Replace black dye with "mcl_mobitems:ink_sac".

The squid ink sac mob drop has been registered as `"mcl_dye:black"`
because it doubled as the black dye for lack of a proper black dye.
This commit makes the squid ink sac its own `"mcl_mobitems:ink_sac"`
item and updates the ink sac users (but not the black dye users.)

* Add craftitem for "mcl_mobitems:ink_sac".
* Update squid drop.
* Update crafting recipe for book and quill.
* Update fishing loot.
---
 mods/ENTITIES/mobs_mc/0_gameconfig.lua            |   2 +-
 mods/ENTITIES/mobs_mc/squid.lua                   |   2 +-
 mods/ENTITIES/mobs_mc_gameconfig/init.lua         |   2 +-
 mods/ITEMS/mcl_books/init.lua                     |   4 ++--
 mods/ITEMS/mcl_core/textures/mcl_core_lapis.png   | Bin 0 -> 169 bytes
 mods/ITEMS/mcl_fishing/init.lua                   |   2 +-
 mods/ITEMS/mcl_mobitems/init.lua                  |   8 ++++++++
 mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.de.tr |   3 +++
 mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.es.tr |   3 +++
 mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr |   5 ++++-
 mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.pl.tr |   3 +++
 mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.ru.tr |   3 +++
 mods/ITEMS/mcl_mobitems/locale/template.txt       |   3 +++
 .../textures/mcl_mobitems_ink_sac.png             | Bin 0 -> 190 bytes
 14 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_lapis.png
 create mode 100644 mods/ITEMS/mcl_mobitems/textures/mcl_mobitems_ink_sac.png

diff --git a/mods/ENTITIES/mobs_mc/0_gameconfig.lua b/mods/ENTITIES/mobs_mc/0_gameconfig.lua
index c92ccbba5..fc1193571 100644
--- a/mods/ENTITIES/mobs_mc/0_gameconfig.lua
+++ b/mods/ENTITIES/mobs_mc/0_gameconfig.lua
@@ -82,7 +82,7 @@ mobs_mc.items = {
 	flint_and_steel = "fire:flint_and_steel",
 	water_source = "default:water_source",
 	river_water_source = "default:river_water_source",
-	black_dye = "dye:black",
+	ink_sac = "mcl_mobitems:ink_sac",
 	poppy = "flowers:rose",
 	dandelion = "flowers:dandelion_yellow",
 	coal = "default:coal_lump",
diff --git a/mods/ENTITIES/mobs_mc/squid.lua b/mods/ENTITIES/mobs_mc/squid.lua
index 0c425bb51..f69bdbdc7 100644
--- a/mods/ENTITIES/mobs_mc/squid.lua
+++ b/mods/ENTITIES/mobs_mc/squid.lua
@@ -40,7 +40,7 @@ mobs:register_mob("mobs_mc:squid", {
 		run_end = 60,
 	},
     drops = {
-		{name = mobs_mc.items.black_dye,
+		{name = mobs_mc.items.ink_sac,
 		chance = 1,
 		min = 1,
 		max = 3,
diff --git a/mods/ENTITIES/mobs_mc_gameconfig/init.lua b/mods/ENTITIES/mobs_mc_gameconfig/init.lua
index 06d7eb87f..1da38c528 100644
--- a/mods/ENTITIES/mobs_mc_gameconfig/init.lua
+++ b/mods/ENTITIES/mobs_mc_gameconfig/init.lua
@@ -57,7 +57,7 @@ mobs_mc.override.items = {
 	flint_and_steel = "mcl_fire:flint_and_steel",
 	water_source = "mcl_core:water_source",
 	river_water_source = "mclx_core:river_water_source",
-	black_dye = "mcl_dye:black",
+	ink_sac = "mcl_mobitems:ink_sac",
 	poppy = "mcl_flowers:poppy",
 	dandelion = "mcl_flowers:dandelion",
 	coal = "mcl_core:coal_lump",
diff --git a/mods/ITEMS/mcl_books/init.lua b/mods/ITEMS/mcl_books/init.lua
index 446be8cd6..5ee910525 100644
--- a/mods/ITEMS/mcl_books/init.lua
+++ b/mods/ITEMS/mcl_books/init.lua
@@ -187,11 +187,11 @@ minetest.register_on_player_receive_fields(function ( player, formname, fields )
 	end
 end)
 
-if minetest.get_modpath("mcl_dye") and minetest.get_modpath("mcl_mobitems") then
+if minetest.get_modpath("mcl_mobitems") then
 	minetest.register_craft({
 		type = "shapeless",
 		output = "mcl_books:writable_book",
-		recipe = { "mcl_books:book", "mcl_dye:black", "mcl_mobitems:feather" },
+		recipe = { "mcl_books:book", "mcl_mobitems:ink_sac", "mcl_mobitems:feather" },
 	})
 end
 
diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_lapis.png b/mods/ITEMS/mcl_core/textures/mcl_core_lapis.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0e3023075fce96f8d13cdc4fd89f75fc2356b8a
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=8gu#sB~RSC3p8(R9E%
zdrQlb%L=ZuWo$YNZf`vXlx8jo@(Tvizsio>15#F=E{-7;jL8WCEevd`izE)|H7!eM
z%j`;+q1X|a^D0M(BWcU_B_`rcqTOuHBHb<KP7;qAS$x|VSQ)go@VC25ylw!R!r<xZ
K=d#Wzp$Pze1~mTw

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua
index 788e591dc..1fab8cb23 100644
--- a/mods/ITEMS/mcl_fishing/init.lua
+++ b/mods/ITEMS/mcl_fishing/init.lua
@@ -88,7 +88,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,
diff --git a/mods/ITEMS/mcl_mobitems/init.lua b/mods/ITEMS/mcl_mobitems/init.lua
index a7b04d3d4..fa79448d2 100644
--- a/mods/ITEMS/mcl_mobitems/init.lua
+++ b/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."),
diff --git a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.de.tr b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.de.tr
index 2fd938f2f..7c0d39334 100644
--- a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.de.tr
+++ b/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
diff --git a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.es.tr b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.es.tr
index 746a438b0..92de8d870 100644
--- a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.es.tr
+++ b/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
diff --git a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr
index d31632345..59cdd4a4b 100644
--- a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.fr.tr
+++ b/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
@@ -91,4 +94,4 @@ Carrot on a Stick=Carotte sur un Batôn
 Lets you ride a saddled pig=Vous permet de monter un cochon sellé
 A carrot on a stick can be used on saddled pigs to ride them.=Une carotte sur un bâton peut être utilisée sur les porcs sellés pour les monter.
 
-Place it on a saddled pig to mount it. You can now ride the pig like a horse. Pigs will also walk towards you when you just wield the carrot on a stick.=Placez-le sur un cochon sellé pour le monter. Vous pouvez maintenant monter le cochon comme un cheval. Les porcs marcheront également vers vous lorsque vous brandirez la carotte sur un bâton.
\ No newline at end of file
+Place it on a saddled pig to mount it. You can now ride the pig like a horse. Pigs will also walk towards you when you just wield the carrot on a stick.=Placez-le sur un cochon sellé pour le monter. Vous pouvez maintenant monter le cochon comme un cheval. Les porcs marcheront également vers vous lorsque vous brandirez la carotte sur un bâton.
diff --git a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.pl.tr b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.pl.tr
index dd78a692f..a58bfb474 100644
--- a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.pl.tr
+++ b/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
diff --git a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.ru.tr b/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.ru.tr
index f51e4f562..f1fad35c9 100644
--- a/mods/ITEMS/mcl_mobitems/locale/mcl_mobitems.ru.tr
+++ b/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=Огненный стержень
diff --git a/mods/ITEMS/mcl_mobitems/locale/template.txt b/mods/ITEMS/mcl_mobitems/locale/template.txt
index ce5bbcabe..7eac56e15 100644
--- a/mods/ITEMS/mcl_mobitems/locale/template.txt
+++ b/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=
diff --git a/mods/ITEMS/mcl_mobitems/textures/mcl_mobitems_ink_sac.png b/mods/ITEMS/mcl_mobitems/textures/mcl_mobitems_ink_sac.png
new file mode 100644
index 0000000000000000000000000000000000000000..95a8df4ad1c2c5e467d93160fd3b77f4f3460d53
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`t)4E9Ar*{wFEX+nFyLXm5Vy$T
zAcKZP1CzD0zro&v=jQ)>YW#WeYlAf|Mo+$8Kh)nh(|0OMl=Ye^XX6+n{4x!{%(-so
z&$vVK^wxK>2h6!XKURMbrpKHlK7%cQWk*j4(?o{gf=DHwmrUQ6cQ6^TNqoP>`Mbem
o;RK0f2__eg!m|HOhwLoXlUEoBRh^M%2Rews)78&qol`;+0L%qMT>t<8

literal 0
HcmV?d00001