lanxu/MineClone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert minecraft color set usage in mcl_books and mcl_skins GUI menus.

Browse Source 
(Follow-up of d8d4cb5def)
Reverts a2fcd28a3d and partially reverts f8a627915e.
This commit is contained in:
Elias Fleckenstein 2021-04-19 15:16:59 +02:00
parent d8d4cb5def
commit 7efc177188
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/ITEMS/mcl_books/init.lua
View File

@ -67,7 +67,7 @@ local make_description = function(title, author, generation)
else else
desc = S("Tattered Book") desc = S("Tattered Book")
end 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 return desc
end end
@ -147,8 +147,8 @@ minetest.register_on_player_receive_fields(function ( player, formname, fields )
local formspec = "size[8,9]".. local formspec = "size[8,9]"..
header.. header..
"background[-0.5,-0.5;9,10;mcl_books_book_bg.png]".. "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:")))..";]".. "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(mcl_colors.DARK_GRAY, S("by @1", name))).."]".. "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")).."]".. "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")).."]".. "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")).."]" "button[4.25,7.95;3,1;cancel;"..minetest.formspec_escape(S("Cancel")).."]"

2
mods/ITEMS/mcl_books/mod.conf
View File

@ -1,4 +1,4 @@
name = mcl_books name = mcl_books
author = celeron55 author = celeron55
description = Books mod for MCL2 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

4
mods/PLAYER/mcl_skins/init.lua
View File

@ -239,7 +239,7 @@ end)
mcl_skins.show_formspec = function(playername) mcl_skins.show_formspec = function(playername)
local formspec = "size[7,8.5]" 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;" .. "textlist[0,2.5;6.8,6;skins_set;"
local meta local meta
@ -267,7 +267,7 @@ mcl_skins.show_formspec = function(playername)
if meta then if meta then
if meta.name and meta.name ~= "" 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
end end