diff --git a/mods/default/init.lua b/mods/default/init.lua index d4388e5f..f91b13e1 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -17,7 +17,14 @@ minetest.register_on_joinplayer(function(player) -- Set formspec prepend local formspec = [[ bgcolor[#080808BB;true] - listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] ]] + listcolors[#FFFFFF30;#B0B0B0;#606060;#A0A0A0;#FFF] + style_type[button;bgcolor=#B0B0B0FF] + style_type[button_exit;bgcolor=#B0B0B0FF] + style_type[image_button;bgcolor=#B0B0B0FF] + style_type[image_button_exit;bgcolor=#B0B0B0FF] + style_type[item_image_button;bgcolor=#B0B0B0FF] + style_type[scrollbar;bgimg=#808080FF;fgimg=#606060FF;border=true] + ]] local name = player:get_player_name() local info = minetest.get_player_information(name) if info.formspec_version > 1 then diff --git a/mods/default/textures/gui_formbg.png b/mods/default/textures/gui_formbg.png deleted file mode 100644 index e259fec2..00000000 Binary files a/mods/default/textures/gui_formbg.png and /dev/null differ diff --git a/mods/dreambuilder_extras/customize-dreambuilder-game.sh b/mods/dreambuilder_extras/customize-dreambuilder-game.sh index 9ff23bb5..c97075ca 100755 --- a/mods/dreambuilder_extras/customize-dreambuilder-game.sh +++ b/mods/dreambuilder_extras/customize-dreambuilder-game.sh @@ -50,15 +50,15 @@ rm $workdir"/README.md" \ $workdir"/menu/icon.png" \ $workdir"/menu/header.png" -mv $workdir"/mods/dreambuilder_extras/README.md" $workdir -mv $workdir"/mods/dreambuilder_extras/default_README.txt" $workdir"/mods/default/README.txt" -mv $workdir"/mods/dreambuilder_extras/game.conf" $workdir -mv $workdir"/mods/dreambuilder_extras/minetest.conf" $workdir -mv $workdir"/mods/dreambuilder_extras/minetest.conf.example" $workdir -mv $workdir"/mods/dreambuilder_extras/settingtypes.txt" $workdir -mv $workdir"/mods/dreambuilder_extras/dreambuilder_screenshot.png" $workdir"/screenshot.png" -mv $workdir"/mods/dreambuilder_extras/dreambuilder_menu_icon.png" $workdir"/menu/icon.png" -mv $workdir"/mods/dreambuilder_extras/dreambuilder_menu_overlay.png" $workdir"/menu/background.png" +mv $workdir"/mods/dreambuilder_extras/README.md" $workdir +mv $workdir"/mods/dreambuilder_extras/default_README.txt" $workdir"/mods/default/README.txt" +mv $workdir"/mods/dreambuilder_extras/game.conf" $workdir +mv $workdir"/mods/dreambuilder_extras/minetest.conf" $workdir +mv $workdir"/mods/dreambuilder_extras/minetest.conf.example" $workdir +mv $workdir"/mods/dreambuilder_extras/settingtypes.txt" $workdir +mv $workdir"/mods/dreambuilder_extras/dreambuilder_screenshot.png" $workdir"/screenshot.png" +mv $workdir"/mods/dreambuilder_extras/dreambuilder_menu_icon.png" $workdir"/menu/icon.png" +mv $workdir"/mods/dreambuilder_extras/dreambuilder_menu_overlay.png" $workdir"/menu/background.png" # Convert fake "apple" trees back into just normal default trees, # and don't let them spawn with apples. Ever. @@ -101,7 +101,6 @@ my_mods/moretrees \ my_mods/misc_overrides \ my_mods/nixie_tubes \ my_mods/led_marquee \ -my_mods/pipeworks \ my_mods/signs_lib \ my_mods/basic_signs \ my_mods/street_signs \ @@ -118,7 +117,6 @@ Sokomines_mods/travelnet \ Sokomines_mods/windmill \ RBAs_mods/datastorage \ RBAs_mods/framedglass \ -RBAs_mods/unified_inventory \ Mossmanikins_mods/memorandum \ cheapies_mods/plasticbox \ cheapies_mods/prefab_redo \ @@ -158,19 +156,20 @@ Calinous_mods/moreblocks \ CWzs_mods/replacer \ CWzs_mods/player_textures \ bobblocks \ -unifiedbricks" +unifiedbricks \ +my_mods/pipeworks \ +RBAs_mods/unified_inventory" LINK_MODPACKS_LIST="$(ls -d my_mods/homedecor_modpack/*/) \ $(ls -d my_mods/plantlife_modpack/*/) \ $(ls -d Zeg9s_mods/ufos/*/) \ -$(ls -d Jeijas_mods/mesecons/*/) \ $(ls -d cheapies_mods/roads/*/) \ $(ls -d cool_trees/*/)" COPY_MODPACKS_LIST="$(ls -d RBAs_mods/technic/*/) \ $(ls -d Philipbenrs_mods/castle-modpack/*/) \ -$(ls -d worldedit/*/)" - +$(ls -d worldedit/*/) \ +$(ls -d Jeijas_mods/mesecons/*/)" for i in $LINK_MODS_LIST; do ln -s $upstream_mods_path"/"$i $workdir/mods @@ -218,6 +217,61 @@ sed -i "s/LOAD_OTHERGEN_MODULE = true/LOAD_OTHERGEN_MODULE = false/" \ rm -rf $workdir/mods/worldedit_brush +# Create the standard in-game lightly-shaded theme, and expand on it + +rm $workdir"/mods/default/textures/gui_formbg.png" + +inv_slot_colors="\"listcolors\[#00000000;#00000000;#00000000;#A0A0A0;#FFF\]\" .." + form_bgcolor="#F0F0F0FF" + btn_color="#B0B0B0FF" + editor_text_color="#000000FF" + editor_bg_color="#F0F0F0FF" + scrollbar_color="#808080FF" +scrollbar_handle_color="#606060FF" + +sed -i 's/"field\[.*\]"/ \ +\t\t\t"formspec_version[4]".. \ +\t\t\t"size[8,4]".. \ +\t\t\t"button_exit[3,2.5;2,0.5;proceed;Proceed]".. \ +\t\t\t"field[1.75,1.5;4.5,0.5;channel;Channel;$\{channel\}]" \ +\t\t/' \ + $workdir"/mods/technic/machines/switching_station.lua" + +sed -i "s/listcolors\[.*\]/listcolors[#FFFFFF30;#B0B0B0;#606060;#A0A0A0;#FFF] \ +\n\t\t\tstyle_type[button;bgcolor="$btn_color"] \ +\n\t\t\tstyle_type[button_exit;bgcolor="$btn_color"] \ +\n\t\t\tstyle_type[image_button;bgcolor="$btn_color"] \ +\n\t\t\tstyle_type[image_button_exit;bgcolor="$btn_color"] \ +\n\t\t\tstyle_type[item_image_button;bgcolor="$btn_color"] \ +\n\t\t\tstyle_type[scrollbar;bgimg="$scrollbar_color";fgimg="$scrollbar_handle_color";border=true] \ +\n\t ]]/" \ + $workdir"/mods/default/init.lua" + +sed -i 's/"style_type\[.*\]"/"style_type[label,textarea;font=mono]" \ +\t\t.."style_type[textarea;textcolor='"$editor_text_color"';border=false]" \ +\t\t.."bgcolor['"$form_bgcolor"';false]"/' \ + $workdir"/mods/mesecons_luacontroller/init.lua" + +sed -i 's/local n = 4/formspec[4]="style_type[image_button;bgimg=standard_image_button.png;bgimg_hovered=standard_image_button_brighter.png]" \ +\tlocal n = 5/' \ + $workdir"/mods/unified_inventory/internal.lua" + +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'"$inv_slot_colors"'/' \ + $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'"$inv_slot_colors"'/' \ + $workdir"/mods/pipeworks/compat-furnaces.lua" + +sed -i 's/"size\[8,7;\]" ../"size[8,7]" .. \ +\t"bgcolor['"$form_bgcolor"';false]" .. \ +\t"image[-0.39,-0.4;10.7,9.1;vessels_inv_bg.png]" .. \ +\t'"$inv_slot_colors"'/' \ + $workdir"/mods/vessels/init.lua" + # Add in all of the regular player skins for the player_textures mod rm -f $workdir/mods/player_textures/textures/* @@ -244,6 +298,8 @@ rsync -aL \ rm -rf $workdir* -echo -e "\nCustomization completed. Here's what will be included in the game:\n" -ls -a $game_path $game_path/mods +echo -e "\nCustomization completed.\n" + +#echo -e "Here's what will be included in the game:\n" +#ls -a $game_path $game_path/mods diff --git a/mods/dreambuilder_extras/depends.txt b/mods/dreambuilder_extras/depends.txt index 4ad96d51..f43494f1 100644 --- a/mods/dreambuilder_extras/depends.txt +++ b/mods/dreambuilder_extras/depends.txt @@ -1 +1,5 @@ default +unified_inventory? +pipeworks? +vessels? +technic? diff --git a/mods/dreambuilder_extras/dreambuilder_progress_bar.png b/mods/dreambuilder_extras/dreambuilder_progress_bar.png new file mode 100644 index 00000000..d5aa3fe8 Binary files /dev/null and b/mods/dreambuilder_extras/dreambuilder_progress_bar.png differ diff --git a/mods/dreambuilder_extras/dreambuilder_progress_bar_bg.png b/mods/dreambuilder_extras/dreambuilder_progress_bar_bg.png new file mode 100644 index 00000000..fe895554 Binary files /dev/null and b/mods/dreambuilder_extras/dreambuilder_progress_bar_bg.png differ diff --git a/mods/dreambuilder_extras/textures/default_chest_inv_bg.png b/mods/dreambuilder_extras/textures/default_chest_inv_bg.png new file mode 100644 index 00000000..3e33c2f1 Binary files /dev/null and b/mods/dreambuilder_extras/textures/default_chest_inv_bg.png differ diff --git a/mods/dreambuilder_extras/textures/default_furnace_inv_bg.png b/mods/dreambuilder_extras/textures/default_furnace_inv_bg.png new file mode 100644 index 00000000..2bbcc6fb Binary files /dev/null and b/mods/dreambuilder_extras/textures/default_furnace_inv_bg.png differ diff --git a/mods/dreambuilder_extras/textures/gui_formbg.png b/mods/dreambuilder_extras/textures/gui_formbg.png new file mode 100644 index 00000000..fc0d06e5 Binary files /dev/null and b/mods/dreambuilder_extras/textures/gui_formbg.png differ diff --git a/mods/dreambuilder_extras/textures/gui_hb_bg.png b/mods/dreambuilder_extras/textures/gui_hb_bg.png deleted file mode 100644 index 93897005..00000000 Binary files a/mods/dreambuilder_extras/textures/gui_hb_bg.png and /dev/null differ diff --git a/mods/dreambuilder_extras/textures/gui_hb_bg_16.png b/mods/dreambuilder_extras/textures/gui_hb_bg_16.png deleted file mode 100644 index 2624cd0e..00000000 Binary files a/mods/dreambuilder_extras/textures/gui_hb_bg_16.png and /dev/null differ diff --git a/mods/dreambuilder_extras/textures/gui_hotbar.png b/mods/dreambuilder_extras/textures/gui_hotbar.png deleted file mode 100644 index 4d7beb80..00000000 Binary files a/mods/dreambuilder_extras/textures/gui_hotbar.png and /dev/null differ diff --git a/mods/dreambuilder_extras/textures/gui_hotbar_selected.png b/mods/dreambuilder_extras/textures/gui_hotbar_selected.png deleted file mode 100644 index abb75cc8..00000000 Binary files a/mods/dreambuilder_extras/textures/gui_hotbar_selected.png and /dev/null differ diff --git a/mods/dreambuilder_extras/textures/jeija_close_window.png b/mods/dreambuilder_extras/textures/jeija_close_window.png new file mode 100644 index 00000000..ab14247d Binary files /dev/null and b/mods/dreambuilder_extras/textures/jeija_close_window.png differ diff --git a/mods/dreambuilder_extras/textures/jeija_luac_background.png b/mods/dreambuilder_extras/textures/jeija_luac_background.png new file mode 100644 index 00000000..6cfb1656 Binary files /dev/null and b/mods/dreambuilder_extras/textures/jeija_luac_background.png differ diff --git a/mods/dreambuilder_extras/textures/jeija_luac_runbutton.png b/mods/dreambuilder_extras/textures/jeija_luac_runbutton.png new file mode 100644 index 00000000..3869711e Binary files /dev/null and b/mods/dreambuilder_extras/textures/jeija_luac_runbutton.png differ diff --git a/mods/dreambuilder_extras/textures/standard_image_button.png b/mods/dreambuilder_extras/textures/standard_image_button.png new file mode 100644 index 00000000..995241fe Binary files /dev/null and b/mods/dreambuilder_extras/textures/standard_image_button.png differ diff --git a/mods/dreambuilder_extras/textures/standard_image_button_brighter.png b/mods/dreambuilder_extras/textures/standard_image_button_brighter.png new file mode 100644 index 00000000..fc1380b5 Binary files /dev/null and b/mods/dreambuilder_extras/textures/standard_image_button_brighter.png differ diff --git a/mods/dreambuilder_extras/textures/ui_bags_header.png b/mods/dreambuilder_extras/textures/ui_bags_header.png new file mode 100644 index 00000000..0f900f70 Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_bags_header.png differ diff --git a/mods/dreambuilder_extras/textures/ui_bags_inv_large.png b/mods/dreambuilder_extras/textures/ui_bags_inv_large.png new file mode 100644 index 00000000..ea19e005 Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_bags_inv_large.png differ diff --git a/mods/dreambuilder_extras/textures/ui_bags_inv_medium.png b/mods/dreambuilder_extras/textures/ui_bags_inv_medium.png new file mode 100644 index 00000000..def4f747 Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_bags_inv_medium.png differ diff --git a/mods/dreambuilder_extras/textures/ui_bags_inv_small.png b/mods/dreambuilder_extras/textures/ui_bags_inv_small.png new file mode 100644 index 00000000..53d6539e Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_bags_inv_small.png differ diff --git a/mods/dreambuilder_extras/textures/ui_bags_trash.png b/mods/dreambuilder_extras/textures/ui_bags_trash.png new file mode 100644 index 00000000..5b2b4b3d Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_bags_trash.png differ diff --git a/mods/dreambuilder_extras/textures/ui_crafting_form.png b/mods/dreambuilder_extras/textures/ui_crafting_form.png new file mode 100644 index 00000000..b81851bd Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_crafting_form.png differ diff --git a/mods/dreambuilder_extras/textures/ui_form_bg.png b/mods/dreambuilder_extras/textures/ui_form_bg.png new file mode 100644 index 00000000..f465e8ca Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_form_bg.png differ diff --git a/mods/dreambuilder_extras/textures/ui_main_inventory.png b/mods/dreambuilder_extras/textures/ui_main_inventory.png new file mode 100644 index 00000000..267e51b5 Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_main_inventory.png differ diff --git a/mods/dreambuilder_extras/textures/ui_single_slot.png b/mods/dreambuilder_extras/textures/ui_single_slot.png new file mode 100644 index 00000000..428da1e8 Binary files /dev/null and b/mods/dreambuilder_extras/textures/ui_single_slot.png differ diff --git a/mods/dreambuilder_extras/textures/vessels_inv_bg.png b/mods/dreambuilder_extras/textures/vessels_inv_bg.png new file mode 100644 index 00000000..a4faf3dc Binary files /dev/null and b/mods/dreambuilder_extras/textures/vessels_inv_bg.png differ diff --git a/mods/dreambuilder_extras/textures/vessels_shelf_slot.png b/mods/dreambuilder_extras/textures/vessels_shelf_slot.png new file mode 100644 index 00000000..1f2da28d Binary files /dev/null and b/mods/dreambuilder_extras/textures/vessels_shelf_slot.png differ diff --git a/mods/mesecons_luacontroller/init.lua b/mods/mesecons_luacontroller/init.lua index 1c411dd2..e7a359be 100644 --- a/mods/mesecons_luacontroller/init.lua +++ b/mods/mesecons_luacontroller/init.lua @@ -664,7 +664,9 @@ local function reset_formspec(meta, code, errmsg) code = minetest.formspec_escape(code or "") errmsg = minetest.formspec_escape(tostring(errmsg or "")) meta:set_string("formspec", "size[12,10]" - .."style_type[label,textarea;font=mono]" + .."style_type[label,textarea;font=mono]" + .."style_type[textarea;textcolor=#000000FF;border=false]" + .."bgcolor[#F0F0F0FF;false]" .."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.."]" diff --git a/mods/pipeworks/compat-chests.lua b/mods/pipeworks/compat-chests.lua index 2da00eaf..1eccdc7f 100644 --- a/mods/pipeworks/compat-chests.lua +++ b/mods/pipeworks/compat-chests.lua @@ -14,7 +14,9 @@ local open_chests = {} local function get_chest_formspec(pos) local spos = pos.x .. "," .. pos.y .. "," .. pos.z local formspec = - "size[8,9]" .. + "size[8,9]" .. + "image[-0.39,-0.4;10.7,11.4;default_chest_inv_bg.png]" .. + "listcolors[#00000000;#00000000;#00000000;#A0A0A0;#FFF]" .. default.gui_bg .. default.gui_bg_img .. default.gui_slots .. diff --git a/mods/pipeworks/compat-furnaces.lua b/mods/pipeworks/compat-furnaces.lua index 1894056b..f7210117 100644 --- a/mods/pipeworks/compat-furnaces.lua +++ b/mods/pipeworks/compat-furnaces.lua @@ -11,7 +11,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]".. + "size[8,8.5]".. + "image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]" .. + "listcolors[#00000000;#00000000;#00000000;#A0A0A0;#FFF]" .. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. @@ -44,7 +46,9 @@ local function active_formspec(fuel_percent, item_percent, pos, meta) end local function inactive_formspec(pos, meta) - local formspec = "size[8,8.5]".. + local formspec = "size[8,8.5]".. + "image[-0.39,-0.4;10.7,10.9;default_furnace_inv_bg.png]" .. + "listcolors[#00000000;#00000000;#00000000;#A0A0A0;#FFF]" .. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. diff --git a/mods/technic/machines/.switching_station.lua.swp b/mods/technic/machines/.switching_station.lua.swp new file mode 100644 index 00000000..cef066ca Binary files /dev/null and b/mods/technic/machines/.switching_station.lua.swp differ diff --git a/mods/technic/machines/switching_station.lua b/mods/technic/machines/switching_station.lua index 56a0db03..60abe448 100644 --- a/mods/technic/machines/switching_station.lua +++ b/mods/technic/machines/switching_station.lua @@ -44,7 +44,12 @@ minetest.register_node("technic:switching_station",{ meta:set_string("infotext", S("Switching Station")) meta:set_string("active", 1) meta:set_string("channel", "switching_station"..minetest.pos_to_string(pos)) - meta:set_string("formspec", "field[channel;Channel;${channel}]") + meta:set_string("formspec", + "formspec_version[4]".. + "size[8,4]".. + "button_exit[3,2.5;2,0.5;proceed;Proceed]".. + "field[1.75,1.5;4.5,0.5;channel;Channel;${channel}]" + ) local poshash = minetest.hash_node_position(pos) technic.redundant_warn.poshash = nil end, diff --git a/mods/unified_inventory/internal.lua b/mods/unified_inventory/internal.lua index eeab695d..ff678c05 100644 --- a/mods/unified_inventory/internal.lua +++ b/mods/unified_inventory/internal.lua @@ -67,7 +67,8 @@ function unified_inventory.get_formspec(player, page) pagedef.formspec_prepend and "" or "no_prepend[]", "background[-0.19,-0.25;14.4,10.75;ui_form_bg.png]" -- Background } - local n = 4 + formspec[4]="style_type[image_button;bgimg=standard_image_button.png;bgimg_hovered=standard_image_button_brighter.png]" + local n = 5 if draw_lite_mode then formspec[1] = "size[11,7.7]" diff --git a/mods/unified_inventory/textures/standard_image_button.png b/mods/unified_inventory/textures/standard_image_button.png new file mode 100644 index 00000000..995241fe Binary files /dev/null and b/mods/unified_inventory/textures/standard_image_button.png differ diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua index 71a06893..67a55a69 100644 --- a/mods/vessels/init.lua +++ b/mods/vessels/init.lua @@ -8,7 +8,10 @@ local S = minetest.get_translator("vessels") local vessels_shelf_formspec = - "size[8,7;]" .. + "size[8,7]" .. + "bgcolor[#F0F0F0FF;false]" .. + "image[-0.39,-0.4;10.7,9.1;vessels_inv_bg.png]" .. + "listcolors[#00000000;#00000000;#00000000;#A0A0A0;#FFF]" .. "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]" ..