From 7efc177188b1f6dc2d03704ca9a032a7e7ee5480 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Mon, 19 Apr 2021 15:16:59 +0200
Subject: [PATCH] Revert minecraft color set usage in mcl_books and mcl_skins
 GUI menus. (Follow-up of d8d4cb5defcbe1ca1b71100441cc6636557752c8) Reverts
 a2fcd28a3dcbf1aaa07c9f2c21ba7cd3872b7cd4 and partially reverts
 f8a627915e17779bec1a52fe867877036c043f72.

---
 mods/ITEMS/mcl_books/init.lua  | 6 +++---
 mods/ITEMS/mcl_books/mod.conf  | 2 +-
 mods/PLAYER/mcl_skins/init.lua | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mods/ITEMS/mcl_books/init.lua b/mods/ITEMS/mcl_books/init.lua
index 5101994e9..144cce1b4 100644
--- a/mods/ITEMS/mcl_books/init.lua
+++ b/mods/ITEMS/mcl_books/init.lua
@@ -67,7 +67,7 @@ local make_description = function(title, author, generation)
 	else
 		desc = S("Tattered Book")
 	end
-	desc = desc .. "\n" .. minetest.colorize(mcl_colors.GRAY, S("by @1", author))
+	desc = desc .. "\n" .. minetest.colorize("#AAAAAA", S("by @1", author))
 	return desc
 end
 
@@ -147,8 +147,8 @@ minetest.register_on_player_receive_fields(function ( player, formname, fields )
 				local formspec = "size[8,9]"..
 					header..
 					"background[-0.5,-0.5;9,10;mcl_books_book_bg.png]"..
-					"field[0.75,1;7.25,1;title;"..minetest.formspec_escape(minetest.colorize(mcl_colors.BLACK, S("Enter book title:")))..";]"..
-					"label[0.75,1.5;"..minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("by @1", name))).."]"..
+					"field[0.75,1;7.25,1;title;"..minetest.formspec_escape(minetest.colorize("#000000", S("Enter book title:")))..";]"..
+					"label[0.75,1.5;"..minetest.formspec_escape(minetest.colorize("#404040", S("by @1", name))).."]"..
 					"button_exit[0.75,7.95;3,1;sign;"..minetest.formspec_escape(S("Sign and Close")).."]"..
 					"tooltip[sign;"..minetest.formspec_escape(S("Note: The book will no longer be editable after signing")).."]"..
 					"button[4.25,7.95;3,1;cancel;"..minetest.formspec_escape(S("Cancel")).."]"
diff --git a/mods/ITEMS/mcl_books/mod.conf b/mods/ITEMS/mcl_books/mod.conf
index cea9a5dd8..7c4513b00 100644
--- a/mods/ITEMS/mcl_books/mod.conf
+++ b/mods/ITEMS/mcl_books/mod.conf
@@ -1,4 +1,4 @@
 name = mcl_books
 author = celeron55
 description = Books mod for MCL2
-optional_depends = mcl_init, mcl_core, mcl_sounds, mcl_mobitems, mcl_dye, mcl_colors
+optional_depends = mcl_init, mcl_core, mcl_sounds, mcl_mobitems, mcl_dye
diff --git a/mods/PLAYER/mcl_skins/init.lua b/mods/PLAYER/mcl_skins/init.lua
index 297817fac..0b508adc6 100644
--- a/mods/PLAYER/mcl_skins/init.lua
+++ b/mods/PLAYER/mcl_skins/init.lua
@@ -239,7 +239,7 @@ end)
 mcl_skins.show_formspec = function(playername)
 	local formspec = "size[7,8.5]"
 
-	formspec = formspec .. "label[2,2;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Select player skin:"))) .. "]"
+	formspec = formspec .. "label[2,2;" .. minetest.formspec_escape(minetest.colorize("#383838", S("Select player skin:"))) .. "]"
 		.. "textlist[0,2.5;6.8,6;skins_set;"
 
 	local meta
@@ -267,7 +267,7 @@ mcl_skins.show_formspec = function(playername)
 
 	if meta then
 		if meta.name and meta.name ~= "" then
-			formspec = formspec .. "label[2,0.5;" .. minetest.formspec_escape(minetest.colorize(mcl_colors.DARK_GRAY, S("Name: @1", meta.name))) .. "]"
+			formspec = formspec .. "label[2,0.5;" .. minetest.formspec_escape(minetest.colorize("#383838", S("Name: @1", meta.name))) .. "]"
 		end
 	end