1 files changed, 17 insertions, 14 deletions

diff --git a/logic/JavaChecker.cpp b/logic/JavaChecker.cpp
index 113974ff..b87ee3d5 100644
--- a/logic/JavaChecker.cpp
+++ b/logic/JavaChecker.cpp
@@ -1,31 +1,28 @@
 #include "JavaChecker.h"
+#include "MultiMC.h"
+#include <pathutils.h>
 #include <QFile>
 #include <QProcess>
 #include <QMap>
 #include <QTemporaryFile>
 
-#define CHECKER_FILE "JavaChecker.jar"
-
 JavaChecker::JavaChecker(QObject *parent) : QObject(parent)
 {
 }
 
 void JavaChecker::performCheck()
 {
-	checkerJar.setFileTemplate("checker_XXXXXX.jar");
-	checkerJar.open();
-	QFile inner(":/java/checker.jar");
-	inner.open(QIODevice::ReadOnly);
-	checkerJar.write(inner.readAll());
-	inner.close();
-	checkerJar.close();
+	QString checkerJar = PathCombine(MMC->bin(), "jars", "JavaCheck.jar");
 
-	QStringList args = {"-jar", checkerJar.fileName()};
+	QStringList args = {"-jar", checkerJar};
 
 	process.reset(new QProcess());
 	process->setArguments(args);
 	process->setProgram(path);
 	process->setProcessChannelMode(QProcess::SeparateChannels);
+	QLOG_DEBUG() << "Running java checker!";
+	QLOG_DEBUG() << "Java: " + path;
+	QLOG_DEBUG() << "Args: {" + args.join("|") + "}";
 
 	connect(process.get(), SIGNAL(finished(int, QProcess::ExitStatus)), this,
 			SLOT(finished(int, QProcess::ExitStatus)));
@@ -42,21 +39,25 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 	killTimer.stop();
 	QProcessPtr _process;
 	_process.swap(process);
-	checkerJar.remove();
 
 	JavaCheckResult result;
 	{
 		result.path = path;
+		result.id = id;
 	}
+	QLOG_DEBUG() << "Java checker finished with status " << status << " exit code " << exitcode;
 
 	if (status == QProcess::CrashExit || exitcode == 1)
 	{
+		QLOG_DEBUG() << "Java checker failed!";
 		emit checkFinished(result);
 		return;
 	}
 
 	bool success = true;
 	QString p_stdout = _process->readAllStandardOutput();
+	QLOG_DEBUG() << p_stdout;
+
 	QMap<QString, QString> results;
 	QStringList lines = p_stdout.split("\n", QString::SkipEmptyParts);
 	for(QString line : lines)
@@ -76,6 +77,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 
 	if(!results.contains("os.arch") || !results.contains("java.version") || !success)
 	{
+		QLOG_DEBUG() << "Java checker failed - couldn't extract required information.";
 		emit checkFinished(result);
 		return;
 	}
@@ -90,7 +92,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 	result.mojangPlatform = is_64 ? "64" : "32";
 	result.realPlatform = os_arch;
 	result.javaVersion = java_version;
-
+	QLOG_DEBUG() << "Java checker succeeded.";
 	emit checkFinished(result);
 }
 
@@ -99,11 +101,11 @@ void JavaChecker::error(QProcess::ProcessError err)
 	if(err == QProcess::FailedToStart)
 	{
 		killTimer.stop();
-		checkerJar.remove();
-
+		QLOG_DEBUG() << "Java checker has failed to start.";
 		JavaCheckResult result;
 		{
 			result.path = path;
+			result.id = id;
 		}
 
 		emit checkFinished(result);
@@ -116,6 +118,7 @@ void JavaChecker::timeout()
 	// NO MERCY. NO ABUSE.
 	if(process)
 	{
+		QLOG_DEBUG() << "Java checker has been killed by timeout.";
 		process->kill();
 	}
 }