GH-1016 print list of mods, coremods and jarmods

Includes a change to jar mods, where they gain an 'originalName' attribute used only for display

1 files changed, 15 insertions, 3 deletions

diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp
index 74c28a8f..ffccc259 100644
--- a/logic/minecraft/OneSixInstance.cpp
+++ b/logic/minecraft/OneSixInstance.cpp
@@ -136,17 +136,29 @@ BaseProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session)
 
 	for(auto & mod: loaderModList()->allMods())
 	{
-		launchScript += "mod " + mod.filename().absoluteFilePath()  + "\n";;
+		if(!mod.enabled())
+			continue;
+		if(mod.type() == Mod::MOD_FOLDER)
+			continue;
+		// TODO: proper implementation would need to descend into folders.
+
+		launchScript += "mod " + mod.filename().completeBaseName()  + "\n";;
 	}
 
 	for(auto & coremod: coreModList()->allMods())
 	{
-		launchScript += "coremod " + coremod.filename().absoluteFilePath()  + "\n";;
+		if(!coremod.enabled())
+			continue;
+		if(coremod.type() == Mod::MOD_FOLDER)
+			continue;
+		// TODO: proper implementation would need to descend into folders.
+
+		launchScript += "coremod " + coremod.filename().completeBaseName()  + "\n";;
 	}
 
 	for(auto & jarmod: m_version->jarMods)
 	{
-		launchScript += "jarmod " + jarmod->name  + "\n";;
+		launchScript += "jarmod " + jarmod->originalName + " (" + jarmod->name + ")\n";
 	}
 
 	// libraries and class path.