VanessaE/dreambuilder_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some colors were being applied wrong

Browse Source
This commit is contained in:
Vanessa Dannenberg 2021-03-04 03:11:54 -05:00
parent 3d8aec86a7
commit 6ed04e5fee
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mods/default/craftitems.lua
View File

@ -51,7 +51,6 @@ local function book_on_use(itemstack, user)
formspec = "size[8,8]" ..
"label[0.5,0.5;" .. esc(S("by @1", owner)) .. "]" ..
"tablecolumns[color;text]" ..
"tableoptions[background=#00000000;highlight=#00000000;border=false]" ..
"table[0.4,0;7,0.5;title;#FFFF00," .. esc(title) .. "]" ..
"textarea[0.5,1.5;7.5,7;;" ..
minetest.formspec_escape(string ~= "" and string or text) .. ";]" ..

10
mods/default/init.lua
View File

@ -17,11 +17,11 @@ minetest.register_on_joinplayer(function(player)
-- Set formspec prepend
local formspec =
"listcolors["..dreambuilder_theme.listcolor_slot_bg_normal..
";"..dreambuilder_theme.listcolor_slot_bg_hover..
";"..dreambuilder_theme.listcolor_slot_border..
";"..dreambuilder_theme.tooltip_bgcolor..
";"..dreambuilder_theme.tooltip_fontcolor.."]"..
"style_type[button;bgcolor="..dreambuilder_theme.form_bgcolor.."]"..
";"..dreambuilder_theme.listcolor_slot_bg_hover..
";"..dreambuilder_theme.listcolor_slot_border..
";"..dreambuilder_theme.tooltip_bgcolor..
";"..dreambuilder_theme.tooltip_fontcolor.."]"..
"style_type[button;bgcolor="..dreambuilder_theme.btn_color.."]"..
"style_type[button_exit;bgcolor="..dreambuilder_theme.form_bgcolor.."]"..
"style_type[image_button;bgcolor="..dreambuilder_theme.form_bgcolor..
";border="..dreambuilder_theme.image_button_borders.."]"..

16
mods/dreambuilder_extras/customize-dreambuilder-game.sh
View File

@ -211,14 +211,14 @@ rm -rf $workdir/mods/worldedit_brush
cat > /tmp/listcolors << 'EOF'
"listcolors["..dreambuilder_theme.listcolor_slot_bg_normal..
";"..dreambuilder_theme.listcolor_slot_bg_hover..
";"..dreambuilder_theme.listcolor_slot_border..
";"..dreambuilder_theme.tooltip_bgcolor..
";"..dreambuilder_theme.tooltip_fontcolor.."]"..
";"..dreambuilder_theme.listcolor_slot_bg_hover..
";"..dreambuilder_theme.listcolor_slot_border..
";"..dreambuilder_theme.tooltip_bgcolor..
";"..dreambuilder_theme.tooltip_fontcolor.."]"..
EOF
cat > /tmp/herefileA << 'EOF'
"style_type[button;bgcolor="..dreambuilder_theme.form_bgcolor.."]"..
"style_type[button;bgcolor="..dreambuilder_theme.btn_color.."]"..
"style_type[button_exit;bgcolor="..dreambuilder_theme.form_bgcolor.."]"..
"style_type[image_button;bgcolor="..dreambuilder_theme.form_bgcolor..
";border="..dreambuilder_theme.image_button_borders.."]"..
@ -228,6 +228,8 @@ cat > /tmp/herefileA << 'EOF'
";border="..dreambuilder_theme.image_button_borders.."]"
EOF
# ;highlight=#00000000
mv $workdir"/mods/dreambuilder_extras/minetest.conf" $workdir
sed -i "s/bgcolor\[.*\]//" \
@ -247,12 +249,12 @@ sed -i '/default.gui_survival_form/ {
a \\t\t\tdefault.gui_bg..
}' $workdir"/mods/default/init.lua"
sed -i '/tableoptions/d' $workdir"/mods/default/craftitems.lua"
echo "depends = dreambuilder_gui_theming" >> $workdir"/mods/default/mod.conf"
sed -i 's/"style_type\[.*\]"/"style_type[label,textarea;font=mono]" \
\t\t.."style_type[textarea;textcolor="..dreambuilder_theme.form_bgcolor..";border="..dreambuilder_theme.editor_border.."]"/' \
\t\t.."style_type[textarea;textcolor="..dreambuilder_theme.editor_text_color..";border="..dreambuilder_theme.editor_border.."]"/' \
$workdir"/mods/mesecons_luacontroller/init.lua"
sed -i "0,/depends =/s//depends = dreambuilder_gui_theming, /" $workdir"/mods/mesecons/mod.conf"

2
mods/mesecons_luacontroller/init.lua
View File

@ -665,7 +665,7 @@ local function reset_formspec(meta, code, errmsg)
errmsg = minetest.formspec_escape(tostring(errmsg or ""))
meta:set_string("formspec", "size[12,10]"
.."style_type[label,textarea;font=mono]"
.."style_type[textarea;textcolor="..dreambuilder_theme.form_bgcolor..";border="..dreambuilder_theme.editor_border.."]"
.."style_type[textarea;textcolor="..dreambuilder_theme.editor_text_color..";border="..dreambuilder_theme.editor_border.."]"
.."background[-0.2,-0.25;12.4,10.75;jeija_luac_background.png]"
.."label[0.1,8.3;"..errmsg.."]"
.."textarea[0.2,0.2;12.2,9.5;code;;"..code.."]"