12 files changed, 195 insertions, 37 deletions

diff --git a/api/logic/minecraft/launch/ClaimAccount.h b/api/logic/minecraft/launch/ClaimAccount.h
index 53f3cee9..de9007d1 100644
--- a/api/logic/minecraft/launch/ClaimAccount.h
+++ b/api/logic/minecraft/launch/ClaimAccount.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/launch/CreateServerResourcePacksFolder.h b/api/logic/minecraft/launch/CreateServerResourcePacksFolder.h
index 24daa81e..92026ecb 100644
--- a/api/logic/minecraft/launch/CreateServerResourcePacksFolder.h
+++ b/api/logic/minecraft/launch/CreateServerResourcePacksFolder.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.cpp b/api/logic/minecraft/launch/DirectJavaLaunch.cpp
index 07dbb86c..4ccc5c3c 100644
--- a/api/logic/minecraft/launch/DirectJavaLaunch.cpp
+++ b/api/logic/minecraft/launch/DirectJavaLaunch.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.h b/api/logic/minecraft/launch/DirectJavaLaunch.h
index 585b5c74..19087b50 100644
--- a/api/logic/minecraft/launch/DirectJavaLaunch.h
+++ b/api/logic/minecraft/launch/DirectJavaLaunch.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/launch/ExtractNatives.cpp b/api/logic/minecraft/launch/ExtractNatives.cpp
index f30dea89..7ddde374 100644
--- a/api/logic/minecraft/launch/ExtractNatives.cpp
+++ b/api/logic/minecraft/launch/ExtractNatives.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/launch/ExtractNatives.h b/api/logic/minecraft/launch/ExtractNatives.h
index 0ec021a9..6e1e7cd4 100644
--- a/api/logic/minecraft/launch/ExtractNatives.h
+++ b/api/logic/minecraft/launch/ExtractNatives.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.cpp b/api/logic/minecraft/launch/LauncherPartLaunch.cpp
index b641968c..1fe9c323 100644
--- a/api/logic/minecraft/launch/LauncherPartLaunch.cpp
+++ b/api/logic/minecraft/launch/LauncherPartLaunch.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,32 @@ LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
 	connect(&m_process, &LoggedProcess::stateChanged, this, &LauncherPartLaunch::on_state);
 }
 
+#ifdef Q_OS_WIN
+// returns 8.3 file format from long path
+#include <windows.h>
+QString shortPathName(const QString & file)
+{
+	auto input = file.toStdWString();
+	std::wstring output;
+	long length = GetShortPathNameW(input.c_str(), NULL, 0);
+	// NOTE: this resizing might seem weird...
+	// when GetShortPathNameW fails, it returns length including null character
+	// when it succeeds, it returns length excluding null character
+	// See: https://msdn.microsoft.com/en-us/library/windows/desktop/aa364989(v=vs.85).aspx
+	output.resize(length);
+	GetShortPathNameW(input.c_str(),(LPWSTR)output.c_str(),length);
+	output.resize(length-1);
+	QString ret = QString::fromStdWString(output);
+	return ret;
+}
+#endif
+
+// if the string survives roundtrip through local 8bit encoding...
+bool fitsInLocal8bit(const QString & string)
+{
+	return string == QString::fromLocal8Bit(string.toLocal8Bit());
+}
+
 void LauncherPartLaunch::executeTask()
 {
 	auto instance = m_parent->instance();
@@ -45,7 +71,44 @@ void LauncherPartLaunch::executeTask()
 	// make detachable - this will keep the process running even if the object is destroyed
 	m_process.setDetachable(true);
 
-	args << "-jar" << FS::PathCombine(ENV.getJarsPath(), "NewLaunch.jar");
+	auto classPath = minecraftInstance->getClassPath();
+	classPath.prepend(FS::PathCombine(ENV.getJarsPath(), "NewLaunch.jar"));
+
+	auto natPath = minecraftInstance->getNativePath();
+#ifdef Q_OS_WIN
+	if (!fitsInLocal8bit(natPath))
+	{
+		args << "-Djava.library.path=" + shortPathName(natPath);
+	}
+	else
+	{
+		args << "-Djava.library.path=" + natPath;
+	}
+#else
+	args << "-Djava.library.path=" + natPath;
+#endif
+
+	args << "-cp";
+#ifdef Q_OS_WIN
+	QStringList processed;
+	for(auto & item: classPath)
+	{
+		if (!fitsInLocal8bit(item))
+		{
+			processed << shortPathName(item);
+		}
+		else
+		{
+			processed << item;
+		}
+	}
+	args << processed.join(';');
+#else
+	args << classPath.join(':');
+#endif
+	args << "org.multimc.EntryPoint";
+
+	qDebug() << args.join(' ');
 
 	QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
 	if(!wrapperCommandStr.isEmpty())
diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.h b/api/logic/minecraft/launch/LauncherPartLaunch.h
index 01c73895..d384c2d1 100644
--- a/api/logic/minecraft/launch/LauncherPartLaunch.h
+++ b/api/logic/minecraft/launch/LauncherPartLaunch.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/api/logic/minecraft/launch/ModMinecraftJar.cpp b/api/logic/minecraft/launch/ModMinecraftJar.cpp
index dad41a98..34825b45 100644
--- a/api/logic/minecraft/launch/ModMinecraftJar.cpp
+++ b/api/logic/minecraft/launch/ModMinecraftJar.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,31 +14,69 @@
  */
 
 #include "ModMinecraftJar.h"
-#include <launch/LaunchTask.h>
-#include <QStandardPaths>
+#include "launch/LaunchTask.h"
+#include "MMCZip.h"
+#include "minecraft/OpSys.h"
+#include "FileSystem.h"
+#include "minecraft/MinecraftInstance.h"
+#include "minecraft/ComponentList.h"
 
 void ModMinecraftJar::executeTask()
 {
-	m_jarModTask = m_parent->instance()->createJarModdingTask();
-	if(m_jarModTask)
+	auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
+
+	if(!m_inst->getJarMods().size())
 	{
-		connect(m_jarModTask.get(), SIGNAL(finished()), this, SLOT(jarModdingFinished()));
-		m_jarModTask->start();
+		emitSucceeded();
 		return;
 	}
+	// nuke obsolete stripped jar(s) if needed
+	if(!FS::ensureFolderPathExists(m_inst->binRoot()))
+	{
+		emitFailed(tr("Couldn't create the bin folder for Minecraft.jar"));
+	}
+
+	auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
+	if(!removeJar())
+	{
+		emitFailed(tr("Couldn't remove stale jar file: %1").arg(finalJarPath));
+	}
+
+	// create temporary modded jar, if needed
+	auto components = m_inst->getComponentList();
+	auto profile = components->getProfile();
+	auto jarMods = m_inst->getJarMods();
+	if(jarMods.size())
+	{
+		auto mainJar = profile->getMainJar();
+		QStringList jars, temp1, temp2, temp3, temp4;
+		mainJar->getApplicableFiles(currentSystem, jars, temp1, temp2, temp3, m_inst->getLocalLibraryPath());
+		auto sourceJarPath = jars[0];
+		if(!MMCZip::createModdedJar(sourceJarPath, finalJarPath, jarMods))
+		{
+			emitFailed(tr("Failed to create the custom Minecraft jar file."));
+			return;
+		}
+	}
 	emitSucceeded();
 }
 
-void ModMinecraftJar::jarModdingFinished()
+void ModMinecraftJar::finalize()
 {
-	if(m_jarModTask->successful())
-	{
-		emitSucceeded();
-	}
-	else
+	removeJar();
+}
+
+bool ModMinecraftJar::removeJar()
+{
+	auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());
+	auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar");
+	QFile finalJar(finalJarPath);
+	if(finalJar.exists())
 	{
-		QString reason = tr("jar modding failed because: %1.\n\n").arg(m_jarModTask->failReason());
-		emit logLine(reason, MessageLevel::Fatal);
-		emitFailed(reason);
+		if(!finalJar.remove())
+		{
+			return false;
+		}
 	}
+	return true;
 }
diff --git a/api/logic/minecraft/launch/ModMinecraftJar.h b/api/logic/minecraft/launch/ModMinecraftJar.h
index 1196c487..b9a2d35b 100644
--- a/api/logic/minecraft/launch/ModMinecraftJar.h
+++ b/api/logic/minecraft/launch/ModMinecraftJar.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 #include <launch/LaunchStep.h>
 #include <memory>
 
-// FIXME: temporary wrapper for existing task.
 class ModMinecraftJar: public LaunchStep
 {
 	Q_OBJECT
@@ -31,9 +30,7 @@ public:
 	{
 		return false;
 	}
-private slots:
-	void jarModdingFinished();
-
+	void finalize() override;
 private:
-	std::shared_ptr<Task> m_jarModTask;
+	bool removeJar();
 };
diff --git a/api/logic/minecraft/launch/PrintInstanceInfo.cpp b/api/logic/minecraft/launch/PrintInstanceInfo.cpp
index a9a87955..83bf584f 100644
--- a/api/logic/minecraft/launch/PrintInstanceInfo.cpp
+++ b/api/logic/minecraft/launch/PrintInstanceInfo.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,73 @@
  * limitations under the License.
  */
 
+#include <fstream>
+#include <string>
+
 #include "PrintInstanceInfo.h"
 #include <launch/LaunchTask.h>
 
 void PrintInstanceInfo::executeTask()
 {
-	auto instance = m_parent->instance();
-	auto lines = instance->verboseDescription(m_session);
-	logLines(lines, MessageLevel::MultiMC);
-	emitSucceeded();
+    auto instance = m_parent->instance();
+    auto lines = instance->verboseDescription(m_session);
+    
+#ifdef Q_OS_LINUX
+    std::ifstream cpuin("/proc/cpuinfo");
+    for (std::string line; std::getline(cpuin, line);)
+    {
+        if (strncmp(line.c_str(), "model name", 10) == 0)
+        {
+            QStringList clines = (QStringList() << QString::fromStdString(line.substr(13, std::string::npos)));
+            logLines(clines, MessageLevel::MultiMC);
+            break;
+        }
+    }
+
+    char buff[512];
+    int gpuline = -1;
+    int cline = 0;
+    FILE *fp = popen("lspci -k", "r");
+    if (fp != NULL)
+    {
+        while (fgets(buff, 512, fp) != NULL)
+        {
+            std::string str(buff);
+            if (str.length() < 9)
+                continue;
+            if (str.substr(8, 3) == "VGA")
+            {
+                gpuline = cline;
+                QStringList glines = (QStringList() << QString::fromStdString(str.substr(35, std::string::npos)));
+                logLines(glines, MessageLevel::MultiMC);
+            }
+            if (gpuline > -1 && gpuline != cline)
+            {
+                if (cline - gpuline < 3)
+                {
+                    QStringList alines = (QStringList() << QString::fromStdString(str.substr(1, std::string::npos)));
+                    logLines(alines, MessageLevel::MultiMC);
+                }
+            }
+            cline++;
+        }
+    }
+    
+    FILE *fp2 = popen("glxinfo", "r");
+    if (fp2 != NULL)
+    {
+        while (fgets(buff, 512, fp2) != NULL)
+        {
+            if (strncmp(buff, "OpenGL version string:", 22) == 0)
+            {
+                QStringList drlines = (QStringList() << QString::fromUtf8(buff));
+                logLines(drlines, MessageLevel::MultiMC);
+                break;
+            }
+        }
+    }
+#endif
+
+    logLines(lines, MessageLevel::MultiMC);
+    emitSucceeded();
 }
diff --git a/api/logic/minecraft/launch/PrintInstanceInfo.h b/api/logic/minecraft/launch/PrintInstanceInfo.h
index 6aed0865..61615ba1 100644
--- a/api/logic/minecraft/launch/PrintInstanceInfo.h
+++ b/api/logic/minecraft/launch/PrintInstanceInfo.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2017 MultiMC Contributors
+/* Copyright 2013-2018 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.