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

use the same base images

Browse Source 
for furnaces, chests, vessels, and homedecor ovens
also brings in a minor homedecor update
This commit is contained in:
Vanessa Dannenberg 2021-03-04 16:33:07 -05:00
parent 85fa3d579a
commit 67da11e2aa
14 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,13 +149,13 @@ unifiedbricks \
my_mods/pipeworks \
RBAs_mods/unified_inventory"
LINK_MODPACKS_LIST="$(ls -d my_mods/homedecor_modpack/*/) \
$(ls -d my_mods/home_workshop_modpack/*/) \
LINK_MODPACKS_LIST="$(ls -d my_mods/home_workshop_modpack/*/) \
$(ls -d my_mods/plantlife_modpack/*/) \
$(ls -d cheapies_mods/roads_modpack/*/) \
$(ls -d cool_trees_modpack/*/)"
COPY_MODPACKS_LIST="$(ls -d RBAs_mods/technic_modpack/*/) \
COPY_MODPACKS_LIST="$(ls -d my_mods/homedecor_modpack/*/) \
$(ls -d RBAs_mods/technic_modpack/*/) \
$(ls -d Philipbenrs_mods/castle-modpack/*/) \
$(ls -d worldedit_modpack/*/) \
$(ls -d Jeijas_mods/mesecons_modpack/*/)"
@ -261,12 +261,15 @@ 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 '/size\[8,9\]/ {
a \\t\t"image[-0.39,-0.4;10.7,11.4;default_chest_inv_bg.png]"..
a \\t\t"image[-0.12,4.73;10.03,4.95;default_standard_inventory_bg.png]"..
a \\t\t"image[-0.12,0.15;10.03,4.79;default_chest_upper_slots_bg.png]"..
r /tmp/LISTCOLORS_HIDE_SLOTS
}' $workdir"/mods/pipeworks/compat-chests.lua"
sed -i '/size\[8,8.5\]/ {
a \\t\t"image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]"..
a \\t\t"image[-0.1,4.15;10.03,4.95;default_standard_inventory_bg.png]"..
a \\t\t"image[2.65,0.37;1.254,3.59;default_furnace_upper_middle_slots_bg.png]"..
a \\t\t"image[4.64,0.83;2.52,2.44;default_furnace_upper_right_slots_bg_2x2.png]"..
r /tmp/LISTCOLORS_HIDE_SLOTS
}' $workdir"/mods/pipeworks/compat-furnaces.lua"
@ -274,10 +277,12 @@ sed -i "0, /depends = /s//depends = dreambuilder_gui_theming, /" $workdir"/mods/
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
a \\t\t"image[-0.1,2.75;10.03,4.95;default_standard_inventory_bg.png]"..
a \\t\t"image[-0.1,0.23;10.03,2.37;vessels_upper_slots_bg.png]"..
}' $workdir"/mods/vessels/init.lua"
# r /tmp/LISTCOLORS_HIDE_SLOTS
sed -i "0, /depends = /s//depends = dreambuilder_gui_theming, /" $workdir"/mods/vessels/mod.conf"
sed -i 's/"field\[.*\]"/ \
@ -395,6 +400,13 @@ sed -i '/"label\[0,0;"/ {
sed -i "0, /depends = /s//depends = dreambuilder_gui_theming, /" $workdir"/mods/technic_chests/mod.conf"
sed -i '/image\[2.75,1.5;1,1;/ {
r /tmp/LISTCOLORS_HIDE_SLOTS
a \\t\t"image[-0.1,4.15;10.03,4.95;default_standard_inventory_bg.png]"..
a \\t\t"image[2.65,0.37;1.254,3.59;default_furnace_upper_middle_slots_bg.png]"..
a \\t\t"image[4.64,0.83;2.52,2.44;default_furnace_upper_right_slots_bg_"..w.."x"..h..".png]"..
}' $workdir"/mods/homedecor_common/furnaces.lua"
mv $workdir"/mods/dreambuilder_extras/dreambuilder_gui_theming" \
$workdir"/mods/"

BIN
mods/dreambuilder_gui_theming/textures/default_chest_inv_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

BIN
mods/dreambuilder_gui_theming/textures/default_chest_upper_slots_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
mods/dreambuilder_gui_theming/textures/default_furnace_inv_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.4 KiB

BIN
mods/dreambuilder_gui_theming/textures/default_furnace_upper_middle_slots_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
mods/dreambuilder_gui_theming/textures/default_furnace_upper_right_slots_bg_2x1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
mods/dreambuilder_gui_theming/textures/default_furnace_upper_right_slots_bg_2x2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
mods/dreambuilder_gui_theming/textures/default_standard_inventory_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
mods/dreambuilder_gui_theming/textures/vessels_inv_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

BIN
mods/dreambuilder_gui_theming/textures/vessels_upper_slots_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

17
mods/homedecor_common/furnaces.lua
View File

@ -26,11 +26,18 @@ local function make_formspec(furnacedef, percent)
local h = math.ceil(furnacedef.output_slots / furnacedef.output_width)
return "size["..math.max(8, 6 + w)..",9]"..
"image[2,2;1,1;"..fire.."]"..
"list[current_name;fuel;2,3;1,1;]"..
"list[current_name;src;2,1;1,1;]"..
"list[current_name;dst;5,1;"..w..","..h..";]"..
"list[current_player;main;0,5;8,4;]"..
"image[2.75,1.5;1,1;"..fire.."]"..
"listcolors[#00000000;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"image[-0.1,4.15;10.03,4.95;default_standard_inventory_bg.png]"..
"image[2.65,0.37;1.254,3.59;default_furnace_upper_middle_slots_bg.png]"..
"image[4.64,0.83;2.52,2.44;default_furnace_upper_right_slots_bg_"..w.."x"..h..".png]"..
"list[current_name;fuel;2.75,2.5;1,1;]"..
"list[current_name;src;2.75,0.5;1,1;]"..
"list[current_name;dst;4.75,0.96;"..w..","..h..";]"..
"list[current_player;main;0,4.25;8,1;]"..
"list[current_player;main;0,5.5;8,3;8]"..
"listring[current_name;dst]"..
"listring[current_player;main]"..
"listring[current_name;src]"..

3
mods/pipeworks/compat-chests.lua
View File

@ -15,7 +15,8 @@ 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]"..
"image[-0.12,4.73;10.03,4.95;default_standard_inventory_bg.png]"..
"image[-0.12,0.15;10.03,4.79;default_chest_upper_slots_bg.png]"..
"listcolors[#00000000;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..

8
mods/pipeworks/compat-furnaces.lua
View File

@ -12,7 +12,9 @@ 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]"..
"image[-0.1,4.15;10.03,4.95;default_standard_inventory_bg.png]"..
"image[2.65,0.37;1.254,3.59;default_furnace_upper_middle_slots_bg.png]"..
"image[4.64,0.83;2.52,2.44;default_furnace_upper_right_slots_bg_2x2.png]"..
"listcolors[#00000000;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
@ -49,7 +51,9 @@ 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]"..
"image[-0.1,4.15;10.03,4.95;default_standard_inventory_bg.png]"..
"image[2.65,0.37;1.254,3.59;default_furnace_upper_middle_slots_bg.png]"..
"image[4.64,0.83;2.52,2.44;default_furnace_upper_right_slots_bg_2x2.png]"..
"listcolors[#00000000;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..

6
mods/vessels/init.lua
View File

@ -9,10 +9,8 @@ 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;"..dreambuilder_theme.listcolor_slot_bg_hover..";#00000000;"..
dreambuilder_theme.tooltip_bgcolor..";"..
dreambuilder_theme.tooltip_fontcolor.."]"..
"image[-0.1,2.75;10.03,4.95;default_standard_inventory_bg.png]"..
"image[-0.1,0.23;10.03,2.37;vessels_upper_slots_bg.png]"..
"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]" ..