From e8eaab64a09462870f95d3e6703aab378e248ddc Mon Sep 17 00:00:00 2001
From: Paul Ouellette <oue.paul18@gmail.com>
Date: Sun, 2 Dec 2018 18:41:05 -0500
Subject: [PATCH] Improve world configure menu (#7922)

Replace `Subgame mods` with <game name> mods.
Display game description on left instead of dependencies.
Fix double DIR_DELIM in some paths.
---
 builtin/mainmenu/dlg_config_world.lua | 20 ++++++++++++--------
 builtin/mainmenu/pkgmgr.lua           |  7 ++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua
index 140eb60d9..1a1107c24 100644
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -33,11 +33,15 @@ local function get_formspec(data)
 
 	local hard_deps, soft_deps = pkgmgr.get_dependencies(mod.path)
 
-	if mod.is_modpack then
+	if mod.is_modpack or mod.type == "game" then
 		local info = minetest.formspec_escape(
 			core.get_content_info(mod.path).description)
 		if info == "" then
-			info = fgettext("No modpack description provided.")
+			if mod.is_modpack then
+				info = fgettext("No modpack description provided.")
+			else
+				info = fgettext("No game description provided.")
+			end
 		end
 		retval = retval ..
 			"textarea[0.25,0.7;5.75,7.2;;" .. info .. ";]"
@@ -63,12 +67,12 @@ local function get_formspec(data)
 
 			if pkgmgr.is_modpack_entirely_enabled(data, mod.name) then
 				retval = retval ..
-					"button[5.5,0.125;2.5,0.5;btn_mp_disable;" ..
-					fgettext("Disable MP") .. "]"
+					"button[5.5,0.125;3,0.5;btn_mp_disable;" ..
+					fgettext("Disable modpack") .. "]"
 			else
 				retval = retval ..
-					"button[5.5,0.125;2.5,0.5;btn_mp_enable;" ..
-					fgettext("Enable MP") .. "]"
+					"button[5.5,0.125;3,0.5;btn_mp_enable;" ..
+					fgettext("Enable modpack") .. "]"
 			end
 		else
 			retval = retval ..
@@ -78,11 +82,11 @@ local function get_formspec(data)
 	end
 	if enabled_all then
 		retval = retval ..
-			"button[8.75,0.125;2.5,0.5;btn_disable_all_mods;" ..
+			"button[8.95,0.125;2.5,0.5;btn_disable_all_mods;" ..
 			fgettext("Disable all") .. "]"
 	else
 		retval = retval ..
-			"button[8.75,0.125;2.5,0.5;btn_enable_all_mods;" ..
+			"button[8.95,0.125;2.5,0.5;btn_enable_all_mods;" ..
 			fgettext("Enable all") .. "]"
 	end
 	return retval ..
diff --git a/builtin/mainmenu/pkgmgr.lua b/builtin/mainmenu/pkgmgr.lua
index eb062ccc8..482a21e37 100644
--- a/builtin/mainmenu/pkgmgr.lua
+++ b/builtin/mainmenu/pkgmgr.lua
@@ -21,7 +21,7 @@ function get_mods(path,retval,modpack)
 
 	for _, name in ipairs(mods) do
 		if name:sub(1, 1) ~= "." then
-			local prefix = path .. DIR_DELIM .. name .. DIR_DELIM
+			local prefix = path .. DIR_DELIM .. name
 			local toadd = {}
 			retval[#retval + 1] = toadd
 
@@ -39,7 +39,7 @@ function get_mods(path,retval,modpack)
 			if modpack ~= nil and modpack ~= "" then
 				toadd.modpack = modpack
 			else
-				local modpackfile = io.open(prefix .. "modpack.txt")
+				local modpackfile = io.open(prefix .. DIR_DELIM .. "modpack.txt")
 				if modpackfile then
 					modpackfile:close()
 					toadd.type = "modpack"
@@ -532,7 +532,8 @@ function pkgmgr.preparemodlist(data)
 		retval[#retval + 1] = {
 			type = "game",
 			is_game_content = true,
-			name = fgettext("Subgame Mods")
+			name = fgettext(gamespec.name .. " mods"),
+			path = gamespec.path
 		}
 	end
 
-- 
2.25.1