cache "hide slots" listcolors into a variable

master
Vanessa Dannenberg 2021-03-04 04:49:02 -05:00
parent 72e15c1df6
commit 8c112d5dc1
4 changed files with 37 additions and 27 deletions

View File

@ -228,7 +228,9 @@ cat > /tmp/herefileA << 'EOF'
";border="..dreambuilder_theme.image_button_borders.."]"
EOF
# ;highlight=#00000000
echo ' "listcolors[#00000000;#00000000;#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..' > /tmp/LISTCOLORS_HIDE_SLOTS
mv $workdir"/mods/dreambuilder_extras/minetest.conf" $workdir
@ -259,23 +261,23 @@ sed -i 's/"style_type\[.*\]"/"style_type[label,textarea;font=mono]" \
sed -i "0,/depends =/s//depends = dreambuilder_gui_theming, /" $workdir"/mods/mesecons/mod.conf"
sed -i 's/"size\[8,9\]" \.\./"size[8,9]" .. \
\t\t"image[-0.39,-0.4;10.7,11.4;default_chest_inv_bg.png]".. \
\t\t"listcolors[#00000000;#00000000;#00000000;"..dreambuilder_theme.tooltip_bgcolor..";"..dreambuilder_theme.tooltip_fontcolor.."]"../' \
$workdir"/mods/pipeworks/compat-chests.lua"
sed -i '/size\[8,9\]/ {
a \\t\t"image[-0.39,-0.4;10.7,11.4;default_chest_inv_bg.png]"..
r /tmp/LISTCOLORS_HIDE_SLOTS
}' $workdir"/mods/pipeworks/compat-chests.lua"
sed -i 's/"size\[8,8.5\]"\.\./"size[8,8.5]".. \
\t\t"image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]".. \
\t\t"listcolors[#00000000;#00000000;#00000000;"..dreambuilder_theme.tooltip_bgcolor..";"..dreambuilder_theme.tooltip_fontcolor.."]"../' \
$workdir"/mods/pipeworks/compat-furnaces.lua"
sed -i '/size\[8,8.5\]/ {
a \\t\t"image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]"..
r /tmp/LISTCOLORS_HIDE_SLOTS
}' $workdir"/mods/pipeworks/compat-furnaces.lua"
sed -i "0, /depends = /s//depends = dreambuilder_gui_theming, /" $workdir"/mods/pipeworks/mod.conf"
sed -i 's/"size\[8,7;\]" ../"size[8,7]" .. \
\t"image[-0.39,-0.4;10.7,9.1;vessels_inv_bg.png]".. \
\t"listcolors[#00000000;#00000000;#00000000;"..dreambuilder_theme.tooltip_bgcolor..";"..dreambuilder_theme.tooltip_fontcolor.."]"../' \
$workdir"/mods/vessels/init.lua"
sed -i '/size\[8,7;\]/ {
a \\t"image[-0.39,-0.4;10.7,9.1;vessels_inv_bg.png]"..
r /tmp/LISTCOLORS_HIDE_SLOTS
}' $workdir"/mods/vessels/init.lua"
sed -i "0, /depends = /s//depends = dreambuilder_gui_theming, /" $workdir"/mods/vessels/mod.conf"
@ -321,11 +323,11 @@ rm $workdir"/mods/default/textures/gui_formbg.png" \
$workdir"/mods/unified_inventory/textures/ui_single_slot.png" \
$workdir"/mods/vessels/textures/vessels_shelf_slot.png"
rm /tmp/herefile*
rm /tmp/herefile* /tmp/LISTCOLORS_HIDE_SLOTS
# Add in all of the regular player skins for the player_textures mod
rm -f $workdir/mods/player_textures/textures/*
rm -f $workdir/mods/player_textures/textures/*
LIST="player_Calinou.png
player_cheapie.png

View File

@ -14,9 +14,11 @@ local open_chests = {}
local function get_chest_formspec(pos)
local spos = pos.x .. "," .. pos.y .. "," .. pos.z
local formspec =
"size[8,9]" ..
"image[-0.39,-0.4;10.7,11.4;default_chest_inv_bg.png]"..
"listcolors[#00000000;#00000000;#00000000;"..dreambuilder_theme.tooltip_bgcolor..";"..dreambuilder_theme.tooltip_fontcolor.."]"..
"size[8,9]" ..
"image[-0.39,-0.4;10.7,11.4;default_chest_inv_bg.png]"..
"listcolors[#00000000;#00000000;#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
default.gui_bg ..
default.gui_bg_img ..
default.gui_slots ..

View File

@ -11,9 +11,11 @@ local tube_entry = "^pipeworks_tube_connection_stony.png"
local function active_formspec(fuel_percent, item_percent, pos, meta)
local formspec =
"size[8,8.5]"..
"image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]"..
"listcolors[#00000000;#00000000;#00000000;"..dreambuilder_theme.tooltip_bgcolor..";"..dreambuilder_theme.tooltip_fontcolor.."]"..
"size[8,8.5]"..
"image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]"..
"listcolors[#00000000;#00000000;#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
default.gui_bg..
default.gui_bg_img..
default.gui_slots..
@ -46,9 +48,11 @@ local function active_formspec(fuel_percent, item_percent, pos, meta)
end
local function inactive_formspec(pos, meta)
local formspec = "size[8,8.5]"..
"image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]"..
"listcolors[#00000000;#00000000;#00000000;"..dreambuilder_theme.tooltip_bgcolor..";"..dreambuilder_theme.tooltip_fontcolor.."]"..
local formspec = "size[8,8.5]"..
"image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]"..
"listcolors[#00000000;#00000000;#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
default.gui_bg..
default.gui_bg_img..
default.gui_slots..

View File

@ -8,9 +8,11 @@ local S = minetest.get_translator("vessels")
local vessels_shelf_formspec =
"size[8,7]" ..
"image[-0.39,-0.4;10.7,9.1;vessels_inv_bg.png]"..
"listcolors[#00000000;#00000000;#00000000;"..dreambuilder_theme.tooltip_bgcolor..";"..dreambuilder_theme.tooltip_fontcolor.."]"..
"size[8,7;]" ..
"image[-0.39,-0.4;10.7,9.1;vessels_inv_bg.png]"..
"listcolors[#00000000;#00000000;#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"list[context;vessels;0,0.3;8,2;]" ..
"list[current_player;main;0,2.85;8,1;]" ..
"list[current_player;main;0,4.08;8,3;8]" ..