1 files changed, 54 insertions, 16 deletions

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;
 }