X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=builtin%2Fmainmenu%2Ftab_content.lua;h=62321059731f8b22f04fe33b5b98883dc532457a;hb=89995efee487939d47e852d35a777e5dcfc28f35;hp=336730bf4d7ea84ca558fcf831885b361503b47a;hpb=3df23e23cd1ace3449660077665f5ebe3e13fdc2;p=dragonfireclient.git

diff --git a/builtin/mainmenu/tab_content.lua b/builtin/mainmenu/tab_content.lua
index 336730bf4..623210597 100644
--- a/builtin/mainmenu/tab_content.lua
+++ b/builtin/mainmenu/tab_content.lua
@@ -19,6 +19,10 @@
 local packages_raw
 local packages
 
+local function modname_valid(name)
+	return not name:find("[^a-z0-9_]")
+end
+
 --------------------------------------------------------------------------------
 local function get_formspec(tabview, name, tabdata)
 	if pkgmgr.global_mods == nil then
@@ -33,6 +37,7 @@ local function get_formspec(tabview, name, tabdata)
 		table.insert_all(packages_raw, pkgmgr.games)
 		table.insert_all(packages_raw, pkgmgr.get_texture_packs())
 		table.insert_all(packages_raw, pkgmgr.global_mods:get_list())
+		table.insert_all(packages_raw, pkgmgr.clientmods:get_list())
 
 		local function get_data()
 			return packages_raw
@@ -45,6 +50,38 @@ local function get_formspec(tabview, name, tabdata)
 
 		packages = filterlist.create(get_data, pkgmgr.compare_package,
 				is_equal, nil, {})
+				
+		local filename = core.get_clientmodpath() .. DIR_DELIM .. "mods.conf"
+
+		local conffile = Settings(filename)
+		local mods = conffile:to_table()
+	
+		for i = 1, #packages_raw do
+			local mod = packages_raw[i]
+			if mod.is_clientside and not mod.is_modpack then
+				if modname_valid(mod.name) then
+					conffile:set("load_mod_" .. mod.name,
+						mod.enabled and "true" or "false")
+				elseif mod.enabled then
+					gamedata.errormessage = fgettext_ne("Failed to enable clientmo" ..
+						"d \"$1\" as it contains disallowed characters. " ..
+						"Only characters [a-z0-9_] are allowed.",
+						mod.name)
+				end
+				mods["load_mod_" .. mod.name] = nil
+			end
+		end
+		
+		-- Remove mods that are not present anymore
+		for key in pairs(mods) do
+			if key:sub(1, 9) == "load_mod_" then
+				conffile:remove(key)
+			end
+		end
+
+		if not conffile:write() then
+			core.log("error", "Failed to write clientmod config file")
+		end
 	end
 
 	if tabdata.selected_pkg == nil then
@@ -94,9 +131,21 @@ local function get_formspec(tabview, name, tabdata)
 
 		if selected_pkg.type == "mod" then
 			if selected_pkg.is_modpack then
-				retval = retval ..
-					"button[8.65,4.65;3.25,1;btn_mod_mgr_rename_modpack;" ..
-					fgettext("Rename") .. "]"
+				if selected_pkg.is_clientside then
+					if pkgmgr.is_modpack_entirely_enabled({list = packages}, selected_pkg.name) then
+						retval = retval ..
+							"button[8.65,4.65;3.25,1;btn_mod_mgr_mp_disable;" ..
+							fgettext("Disable modpack") .. "]"
+					else
+						retval = retval ..
+							"button[8.65,4.65;3.25,1;btn_mod_mgr_mp_enable;" ..
+							fgettext("Enable modpack") .. "]"
+					end
+				else
+					retval = retval ..
+						"button[8.65,4.65;3.25,1;btn_mod_mgr_rename_modpack;" ..
+						fgettext("Rename") .. "]"
+				end
 			else
 				--show dependencies
 				desc = desc .. "\n\n"
@@ -117,6 +166,17 @@ local function get_formspec(tabview, name, tabdata)
 							"\n" .. toadd_soft
 					end
 				end
+				if selected_pkg.is_clientside then
+					if selected_pkg.enabled then
+						retval = retval ..
+							"button[8.65,4.65;3.25,1;btn_mod_mgr_disable_mod;" ..
+							fgettext("Disable") .. "]"
+					else
+						retval = retval ..
+							"button[8.65,4.65;3.25,1;btn_mod_mgr_enable_mod;" ..
+							fgettext("Enable") .. "]"
+					end
+				end
 			end
 
 		else
@@ -150,6 +210,26 @@ local function handle_buttons(tabview, fields, tabname, tabdata)
 	if fields["pkglist"] ~= nil then
 		local event = core.explode_table_event(fields["pkglist"])
 		tabdata.selected_pkg = event.row
+		local mod = packages:get_list()[tabdata.selected_pkg]
+		
+		if event.type == "DCL" and mod.is_clientside then
+			pkgmgr.enable_mod({data = {list = packages, selected_mod = tabdata.selected_pkg}})
+			packages = nil
+		end
+		return true
+	end
+	
+	if fields.btn_mod_mgr_mp_enable ~= nil or
+			fields.btn_mod_mgr_mp_disable ~= nil then
+		pkgmgr.enable_mod({data = {list = packages, selected_mod = tabdata.selected_pkg}}, fields.btn_mod_mgr_mp_enable ~= nil)
+		packages = nil
+		return true
+	end
+	
+	if fields.btn_mod_mgr_enable_mod ~= nil or
+			fields.btn_mod_mgr_disable_mod ~= nil then
+		pkgmgr.enable_mod({data = {list = packages, selected_mod = tabdata.selected_pkg}}, fields.btn_mod_mgr_enable_mod ~= nil)
+		packages = nil
 		return true
 	end