2013-08-07 00:38:18 +01:00
|
|
|
#include "LegacyUpdate.h"
|
|
|
|
#include "lists/LwjglVersionList.h"
|
2013-08-11 23:39:19 +01:00
|
|
|
#include "lists/MinecraftVersionList.h"
|
2013-08-07 00:38:18 +01:00
|
|
|
#include "BaseInstance.h"
|
|
|
|
#include "LegacyInstance.h"
|
2013-09-07 03:00:58 +01:00
|
|
|
#include "MultiMC.h"
|
2013-08-24 02:09:46 +01:00
|
|
|
#include "ModList.h"
|
2013-08-07 00:38:18 +01:00
|
|
|
#include <pathutils.h>
|
|
|
|
#include <quazip.h>
|
|
|
|
#include <quazipfile.h>
|
2013-08-24 02:09:46 +01:00
|
|
|
#include <JlCompress.h>
|
2013-08-07 00:38:18 +01:00
|
|
|
|
|
|
|
|
|
|
|
LegacyUpdate::LegacyUpdate ( BaseInstance* inst, QObject* parent ) : BaseUpdate ( inst, parent ) {}
|
|
|
|
|
|
|
|
void LegacyUpdate::executeTask()
|
|
|
|
{
|
|
|
|
lwjglStart();
|
|
|
|
}
|
|
|
|
|
|
|
|
void LegacyUpdate::lwjglStart()
|
|
|
|
{
|
|
|
|
LegacyInstance * inst = (LegacyInstance *) m_inst;
|
2013-08-08 23:26:35 +01:00
|
|
|
|
|
|
|
lwjglVersion = inst->lwjglVersion();
|
|
|
|
lwjglTargetPath = PathCombine("lwjgl", lwjglVersion );
|
2013-08-24 02:09:46 +01:00
|
|
|
lwjglNativesPath = PathCombine( lwjglTargetPath, "natives");
|
2013-08-08 23:26:35 +01:00
|
|
|
|
|
|
|
// if the 'done' file exists, we don't have to download this again
|
|
|
|
QFileInfo doneFile(PathCombine(lwjglTargetPath, "done"));
|
|
|
|
if(doneFile.exists())
|
|
|
|
{
|
2013-08-11 23:39:19 +01:00
|
|
|
jarStart();
|
2013-08-08 23:26:35 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-08-07 00:38:18 +01:00
|
|
|
auto &list = LWJGLVersionList::get();
|
|
|
|
if(!list.isLoaded())
|
|
|
|
{
|
2013-08-08 23:26:35 +01:00
|
|
|
emitFailed("Too soon! Let the LWJGL list load :)");
|
2013-08-07 00:38:18 +01:00
|
|
|
return;
|
|
|
|
}
|
2013-08-08 23:26:35 +01:00
|
|
|
|
2013-08-11 23:39:19 +01:00
|
|
|
setStatus("Downloading new LWJGL.");
|
2013-08-08 23:26:35 +01:00
|
|
|
auto version = list.getVersion(lwjglVersion);
|
2013-08-07 00:38:18 +01:00
|
|
|
if(!version)
|
|
|
|
{
|
2013-08-08 23:26:35 +01:00
|
|
|
emitFailed("Game update failed: the selected LWJGL version is invalid.");
|
|
|
|
return;
|
2013-08-07 00:38:18 +01:00
|
|
|
}
|
2013-08-08 23:26:35 +01:00
|
|
|
|
2013-08-07 00:38:18 +01:00
|
|
|
QString url = version->url();
|
2013-08-07 00:49:19 +01:00
|
|
|
QUrl realUrl(url);
|
|
|
|
QString hostname = realUrl.host();
|
2013-09-07 03:00:58 +01:00
|
|
|
auto worker = MMC->qnam();
|
2013-08-07 00:49:19 +01:00
|
|
|
QNetworkRequest req(realUrl);
|
|
|
|
req.setRawHeader("Host", hostname.toLatin1());
|
2013-08-07 00:38:18 +01:00
|
|
|
req.setHeader(QNetworkRequest::UserAgentHeader, "Wget/1.14 (linux-gnu)");
|
2013-09-07 03:00:58 +01:00
|
|
|
QNetworkReply * rep = worker->get ( req );
|
2013-08-07 00:38:18 +01:00
|
|
|
|
|
|
|
m_reply = QSharedPointer<QNetworkReply> (rep, &QObject::deleteLater);
|
|
|
|
connect(rep, SIGNAL(downloadProgress(qint64,qint64)), SLOT(updateDownloadProgress(qint64,qint64)));
|
2013-09-07 03:00:58 +01:00
|
|
|
connect(worker, SIGNAL(finished(QNetworkReply*)), SLOT(lwjglFinished(QNetworkReply*)));
|
2013-08-07 00:38:18 +01:00
|
|
|
//connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError)));
|
|
|
|
}
|
|
|
|
|
|
|
|
void LegacyUpdate::lwjglFinished(QNetworkReply* reply)
|
|
|
|
{
|
|
|
|
if(m_reply != reply)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if(reply->error() != QNetworkReply::NoError)
|
|
|
|
{
|
2013-08-08 23:26:35 +01:00
|
|
|
emitFailed( "Failed to download: "+
|
|
|
|
reply->errorString()+
|
|
|
|
"\nSometimes you have to wait a bit if you download many LWJGL versions in a row. YMMV");
|
2013-08-07 00:38:18 +01:00
|
|
|
return;
|
|
|
|
}
|
2013-09-07 03:00:58 +01:00
|
|
|
auto *worker = MMC->qnam();
|
2013-08-07 00:38:18 +01:00
|
|
|
//Here i check if there is a cookie for me in the reply and extract it
|
|
|
|
QList<QNetworkCookie> cookies = qvariant_cast<QList<QNetworkCookie>>(reply->header(QNetworkRequest::SetCookieHeader));
|
|
|
|
if(cookies.count() != 0)
|
|
|
|
{
|
|
|
|
//you must tell which cookie goes with which url
|
2013-09-07 03:00:58 +01:00
|
|
|
worker->cookieJar()->setCookiesFromUrl(cookies, QUrl("sourceforge.net"));
|
2013-08-07 00:38:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
//here you can check for the 302 or whatever other header i need
|
|
|
|
QVariant newLoc = reply->header(QNetworkRequest::LocationHeader);
|
|
|
|
if(newLoc.isValid())
|
|
|
|
{
|
|
|
|
QString redirectedTo = reply->header(QNetworkRequest::LocationHeader).toString();
|
2013-08-07 00:49:19 +01:00
|
|
|
QUrl realUrl(redirectedTo);
|
|
|
|
QString hostname = realUrl.host();
|
2013-08-07 00:38:18 +01:00
|
|
|
QNetworkRequest req(redirectedTo);
|
2013-08-07 00:49:19 +01:00
|
|
|
req.setRawHeader("Host", hostname.toLatin1());
|
2013-08-07 00:38:18 +01:00
|
|
|
req.setHeader(QNetworkRequest::UserAgentHeader, "Wget/1.14 (linux-gnu)");
|
2013-09-07 03:00:58 +01:00
|
|
|
QNetworkReply * rep = worker->get(req);
|
2013-08-07 00:38:18 +01:00
|
|
|
connect(rep, SIGNAL(downloadProgress(qint64,qint64)), SLOT(updateDownloadProgress(qint64,qint64)));
|
|
|
|
m_reply = QSharedPointer<QNetworkReply> (rep, &QObject::deleteLater);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
QFile saveMe("lwjgl.zip");
|
|
|
|
saveMe.open(QIODevice::WriteOnly);
|
|
|
|
saveMe.write(m_reply->readAll());
|
|
|
|
saveMe.close();
|
|
|
|
setStatus("Installing new LWJGL...");
|
|
|
|
extractLwjgl();
|
2013-08-11 23:39:19 +01:00
|
|
|
jarStart();
|
2013-08-07 00:38:18 +01:00
|
|
|
}
|
|
|
|
void LegacyUpdate::extractLwjgl()
|
|
|
|
{
|
|
|
|
// make sure the directories are there
|
2013-08-08 23:26:35 +01:00
|
|
|
|
2013-08-24 02:09:46 +01:00
|
|
|
bool success = ensureFolderPathExists(lwjglNativesPath);
|
2013-08-07 00:38:18 +01:00
|
|
|
|
|
|
|
if(!success)
|
|
|
|
{
|
2013-08-08 23:26:35 +01:00
|
|
|
emitFailed("Failed to extract the lwjgl libs - error when creating required folders.");
|
2013-08-07 00:38:18 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
QuaZip zip("lwjgl.zip");
|
|
|
|
if(!zip.open(QuaZip::mdUnzip))
|
|
|
|
{
|
2013-08-08 23:26:35 +01:00
|
|
|
emitFailed("Failed to extract the lwjgl libs - not a valid archive.");
|
2013-08-07 00:38:18 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// and now we are going to access files inside it
|
|
|
|
QuaZipFile file(&zip);
|
|
|
|
const QString jarNames[] = { "jinput.jar", "lwjgl_util.jar", "lwjgl.jar" };
|
|
|
|
for(bool more=zip.goToFirstFile(); more; more=zip.goToNextFile())
|
|
|
|
{
|
|
|
|
if(!file.open(QIODevice::ReadOnly))
|
|
|
|
{
|
|
|
|
zip.close();
|
2013-08-08 23:26:35 +01:00
|
|
|
emitFailed("Failed to extract the lwjgl libs - error while reading archive.");
|
2013-08-07 00:38:18 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
QuaZipFileInfo info;
|
|
|
|
QString name = file.getActualFileName();
|
|
|
|
if(name.endsWith('/'))
|
|
|
|
{
|
|
|
|
file.close();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
QString destFileName;
|
|
|
|
// Look for the jars
|
|
|
|
for (int i = 0; i < 3; i++)
|
|
|
|
{
|
|
|
|
if (name.endsWith(jarNames[i]))
|
|
|
|
{
|
2013-08-08 23:26:35 +01:00
|
|
|
destFileName = PathCombine(lwjglTargetPath, jarNames[i]);
|
2013-08-07 00:38:18 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Not found? look for the natives
|
|
|
|
if(destFileName.isEmpty())
|
|
|
|
{
|
|
|
|
#ifdef Q_OS_WIN32
|
|
|
|
QString nativesDir = "windows";
|
|
|
|
#else
|
2013-08-26 01:53:29 +01:00
|
|
|
#ifdef Q_OS_MAC
|
|
|
|
QString nativesDir = "macosx";
|
|
|
|
#else
|
2013-08-07 00:38:18 +01:00
|
|
|
QString nativesDir = "linux";
|
2013-08-26 01:53:29 +01:00
|
|
|
#endif
|
2013-08-07 00:38:18 +01:00
|
|
|
#endif
|
|
|
|
if (name.contains(nativesDir))
|
|
|
|
{
|
|
|
|
int lastSlash = name.lastIndexOf('/');
|
|
|
|
int lastBackSlash = name.lastIndexOf('/');
|
|
|
|
if(lastSlash != -1)
|
|
|
|
name = name.mid(lastSlash+1);
|
|
|
|
else if(lastBackSlash != -1)
|
|
|
|
name = name.mid(lastBackSlash+1);
|
2013-08-08 23:26:35 +01:00
|
|
|
destFileName = PathCombine(lwjglNativesPath, name);
|
2013-08-07 00:38:18 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Now if destFileName is still empty, go to the next file.
|
|
|
|
if (!destFileName.isEmpty())
|
|
|
|
{
|
|
|
|
setStatus("Installing new LWJGL - Extracting " + name);
|
|
|
|
QFile output(destFileName);
|
|
|
|
output.open(QIODevice::WriteOnly);
|
|
|
|
output.write(file.readAll()); // FIXME: wste of memory!?
|
|
|
|
output.close();
|
|
|
|
}
|
|
|
|
file.close(); // do not forget to close!
|
|
|
|
}
|
|
|
|
zip.close();
|
|
|
|
m_reply.clear();
|
2013-08-08 23:26:35 +01:00
|
|
|
QFile doneFile(PathCombine(lwjglTargetPath, "done"));
|
|
|
|
doneFile.open(QIODevice::WriteOnly);
|
|
|
|
doneFile.write("done.");
|
|
|
|
doneFile.close();
|
2013-08-07 00:38:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void LegacyUpdate::lwjglFailed()
|
|
|
|
{
|
2013-08-08 23:26:35 +01:00
|
|
|
emitFailed("Bad stuff happened while trying to get the lwjgl libs...");
|
2013-08-07 00:38:18 +01:00
|
|
|
}
|
|
|
|
|
2013-08-11 23:39:19 +01:00
|
|
|
void LegacyUpdate::jarStart()
|
|
|
|
{
|
|
|
|
LegacyInstance * inst = (LegacyInstance *) m_inst;
|
2013-08-24 02:09:46 +01:00
|
|
|
if(!inst->shouldUpdate() || inst->shouldUseCustomBaseJar())
|
2013-08-11 23:39:19 +01:00
|
|
|
{
|
2013-08-24 02:09:46 +01:00
|
|
|
ModTheJar();
|
2013-08-11 23:39:19 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-08-24 02:09:46 +01:00
|
|
|
setStatus("Checking for jar updates...");
|
2013-08-11 23:39:19 +01:00
|
|
|
// Make directories
|
|
|
|
QDir binDir(inst->binDir());
|
|
|
|
if (!binDir.exists() && !binDir.mkpath("."))
|
|
|
|
{
|
|
|
|
emitFailed("Failed to create bin folder.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Build a list of URLs that will need to be downloaded.
|
|
|
|
setStatus("Downloading new minecraft.jar");
|
|
|
|
|
|
|
|
QString urlstr("http://s3.amazonaws.com/Minecraft.Download/versions/");
|
2013-08-24 02:09:46 +01:00
|
|
|
QString intended_version_id = inst->intendedVersionId();
|
|
|
|
urlstr += intended_version_id + "/" + intended_version_id + ".jar";
|
|
|
|
|
2013-09-08 01:15:20 +01:00
|
|
|
auto dljob = new DownloadJob("Minecraft.jar for version " + intended_version_id);
|
|
|
|
dljob->add(QUrl(urlstr), inst->defaultBaseJar());
|
|
|
|
legacyDownloadJob.reset();
|
2013-08-11 23:39:19 +01:00
|
|
|
connect(legacyDownloadJob.data(), SIGNAL(finished()), SLOT(jarFinished()));
|
|
|
|
connect(legacyDownloadJob.data(), SIGNAL(failed()), SLOT(jarFailed()));
|
|
|
|
connect(legacyDownloadJob.data(), SIGNAL(progress(qint64,qint64)), SLOT(updateDownloadProgress(qint64,qint64)));
|
2013-09-01 23:25:40 +01:00
|
|
|
legacyDownloadJob->start();
|
2013-08-11 23:39:19 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void LegacyUpdate::jarFinished()
|
|
|
|
{
|
|
|
|
// process the jar
|
2013-08-24 02:09:46 +01:00
|
|
|
ModTheJar();
|
2013-08-11 23:39:19 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void LegacyUpdate::jarFailed()
|
|
|
|
{
|
|
|
|
// bad, bad
|
|
|
|
emitFailed("Failed to download the minecraft jar. Try again later.");
|
|
|
|
}
|
2013-08-14 07:13:41 +01:00
|
|
|
|
2013-08-28 20:52:19 +01:00
|
|
|
bool LegacyUpdate::MergeZipFiles( QuaZip* into, QFileInfo from, QSet< QString >& contained, MetainfAction metainf )
|
2013-08-24 02:09:46 +01:00
|
|
|
{
|
|
|
|
setStatus("Installing mods - Adding " + from.fileName());
|
|
|
|
|
|
|
|
QuaZip modZip(from.filePath());
|
|
|
|
modZip.open(QuaZip::mdUnzip);
|
|
|
|
|
|
|
|
QuaZipFile fileInsideMod(&modZip);
|
|
|
|
QuaZipFile zipOutFile( into );
|
|
|
|
for(bool more=modZip.goToFirstFile(); more; more=modZip.goToNextFile())
|
|
|
|
{
|
|
|
|
QString filename = modZip.getCurrentFileName();
|
2013-08-28 20:52:19 +01:00
|
|
|
if(filename.contains("META-INF") && metainf == LegacyUpdate::IgnoreMetainf)
|
|
|
|
{
|
|
|
|
qDebug() << "Skipping META-INF " << filename << " from " << from.fileName();
|
2013-08-24 02:09:46 +01:00
|
|
|
continue;
|
2013-08-28 20:52:19 +01:00
|
|
|
}
|
2013-08-24 02:09:46 +01:00
|
|
|
if(contained.contains(filename))
|
2013-08-28 20:52:19 +01:00
|
|
|
{
|
|
|
|
qDebug() << "Skipping already contained file " << filename << " from " << from.fileName();
|
2013-08-24 02:09:46 +01:00
|
|
|
continue;
|
2013-08-28 20:52:19 +01:00
|
|
|
}
|
2013-08-24 02:09:46 +01:00
|
|
|
contained.insert(filename);
|
|
|
|
qDebug() << "Adding file " << filename << " from " << from.fileName();
|
|
|
|
|
|
|
|
if(!fileInsideMod.open(QIODevice::ReadOnly))
|
|
|
|
{
|
2013-08-28 20:52:19 +01:00
|
|
|
qDebug() << "Failed to open " << filename << " from " << from.fileName();
|
2013-08-24 02:09:46 +01:00
|
|
|
return false;
|
|
|
|
}
|
2013-08-25 00:32:42 +01:00
|
|
|
/*
|
|
|
|
QuaZipFileInfo old_info;
|
|
|
|
fileInsideMod.getFileInfo(&old_info);
|
|
|
|
*/
|
|
|
|
QuaZipNewInfo info_out(fileInsideMod.getActualFileName());
|
|
|
|
/*
|
|
|
|
info_out.externalAttr = old_info.externalAttr;
|
|
|
|
*/
|
|
|
|
if(!zipOutFile.open(QIODevice::WriteOnly, info_out))
|
2013-08-24 02:09:46 +01:00
|
|
|
{
|
2013-08-28 20:52:19 +01:00
|
|
|
qDebug() << "Failed to open " << filename << " in the jar";
|
2013-08-24 02:09:46 +01:00
|
|
|
fileInsideMod.close();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if(!JlCompress::copyData(fileInsideMod, zipOutFile))
|
|
|
|
{
|
|
|
|
zipOutFile.close();
|
|
|
|
fileInsideMod.close();
|
2013-08-28 20:52:19 +01:00
|
|
|
qDebug() << "Failed to copy data of " << filename << " into the jar";
|
2013-08-24 02:09:46 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
zipOutFile.close();
|
|
|
|
fileInsideMod.close();
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-08-14 07:13:41 +01:00
|
|
|
void LegacyUpdate::ModTheJar()
|
|
|
|
{
|
|
|
|
LegacyInstance * inst = (LegacyInstance *) m_inst;
|
2013-08-24 02:09:46 +01:00
|
|
|
|
|
|
|
if(!inst->shouldRebuild())
|
|
|
|
{
|
|
|
|
emitSucceeded();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-08-14 07:13:41 +01:00
|
|
|
// Get the mod list
|
2013-08-24 02:09:46 +01:00
|
|
|
auto modList = inst->jarModList();
|
2013-08-14 07:13:41 +01:00
|
|
|
|
2013-08-24 02:09:46 +01:00
|
|
|
QFileInfo runnableJar (inst->runnableJar());
|
|
|
|
QFileInfo baseJar (inst->baseJar());
|
|
|
|
bool base_is_custom = inst->shouldUseCustomBaseJar();
|
2013-08-14 07:13:41 +01:00
|
|
|
|
|
|
|
// Nothing to do if there are no jar mods to install, no backup and just the mc jar
|
2013-08-24 02:09:46 +01:00
|
|
|
if(base_is_custom)
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
2013-08-24 02:09:46 +01:00
|
|
|
// yes, this can happen if the instance only has the runnable jar and not the base jar
|
|
|
|
// it *could* be assumed that such an instance is vanilla, but that wouldn't be safe
|
|
|
|
// because that's not something mmc4 guarantees
|
|
|
|
if(runnableJar.isFile() && !baseJar.exists() && modList->empty())
|
|
|
|
{
|
|
|
|
inst->setShouldRebuild(false);
|
|
|
|
emitSucceeded();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
setStatus("Installing mods - backing up minecraft.jar...");
|
|
|
|
if (!baseJar.exists() && !QFile::copy(runnableJar.filePath(), baseJar.filePath()))
|
|
|
|
{
|
|
|
|
emitFailed("Failed to back up minecraft.jar");
|
|
|
|
return;
|
|
|
|
}
|
2013-08-14 07:13:41 +01:00
|
|
|
}
|
|
|
|
|
2013-08-24 02:09:46 +01:00
|
|
|
if (!baseJar.exists())
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
2013-08-24 02:09:46 +01:00
|
|
|
emitFailed("The base jar " + baseJar.filePath() + " does not exist");
|
2013-08-14 07:13:41 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-08-24 02:09:46 +01:00
|
|
|
if (runnableJar.exists() && !QFile::remove(runnableJar.filePath()))
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
|
|
|
emitFailed("Failed to delete old minecraft.jar");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-08-24 02:09:46 +01:00
|
|
|
//TaskStep(); // STEP 1
|
2013-08-14 07:13:41 +01:00
|
|
|
setStatus("Installing mods - Opening minecraft.jar");
|
|
|
|
|
2013-08-24 02:09:46 +01:00
|
|
|
QuaZip zipOut(runnableJar.filePath());
|
|
|
|
if(!zipOut.open(QuaZip::mdCreate))
|
|
|
|
{
|
|
|
|
QFile::remove(runnableJar.filePath());
|
|
|
|
emitFailed("Failed to open the minecraft.jar for modding");
|
|
|
|
return;
|
|
|
|
}
|
2013-08-14 07:13:41 +01:00
|
|
|
// Files already added to the jar.
|
|
|
|
// These files will be skipped.
|
|
|
|
QSet<QString> addedFiles;
|
|
|
|
|
|
|
|
// Modify the jar
|
|
|
|
setStatus("Installing mods - Adding mod files...");
|
2013-08-24 02:09:46 +01:00
|
|
|
for (int i = modList->size() - 1; i >= 0; i--)
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
2013-08-24 02:09:46 +01:00
|
|
|
auto &mod = modList->operator[](i);
|
|
|
|
if (mod.type() == Mod::MOD_ZIPFILE)
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
2013-08-28 20:52:19 +01:00
|
|
|
if(!MergeZipFiles(&zipOut, mod.filename(), addedFiles, LegacyUpdate::KeepMetainf))
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
2013-08-24 02:09:46 +01:00
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(runnableJar.filePath());
|
|
|
|
emitFailed("Failed to add " + mod.filename().fileName() + " to the jar.");
|
|
|
|
return;
|
2013-08-14 07:13:41 +01:00
|
|
|
}
|
|
|
|
}
|
2013-08-24 02:09:46 +01:00
|
|
|
else if (mod.type() == Mod::MOD_SINGLEFILE)
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
2013-08-25 00:32:42 +01:00
|
|
|
auto filename = mod.filename();
|
|
|
|
if(!JlCompress::compressFile(&zipOut, filename.absoluteFilePath(), filename.fileName()))
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
2013-08-25 00:32:42 +01:00
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(runnableJar.filePath());
|
|
|
|
emitFailed("Failed to add " + filename.fileName() + " to the jar");
|
|
|
|
return;
|
2013-08-14 07:13:41 +01:00
|
|
|
}
|
2013-08-25 00:32:42 +01:00
|
|
|
addedFiles.insert(filename.fileName());
|
|
|
|
qDebug() << "Adding file " << filename.fileName() << " from " << filename.absoluteFilePath();
|
2013-08-14 07:13:41 +01:00
|
|
|
}
|
2013-08-24 02:09:46 +01:00
|
|
|
else if (mod.type() == Mod::MOD_FOLDER)
|
2013-08-14 07:13:41 +01:00
|
|
|
{
|
2013-08-25 00:32:42 +01:00
|
|
|
auto filename = mod.filename();
|
|
|
|
QString what_to_zip = filename.absoluteFilePath();
|
|
|
|
QDir dir(what_to_zip);
|
|
|
|
dir.cdUp();
|
|
|
|
QString parent_dir = dir.absolutePath();
|
|
|
|
if(!JlCompress::compressSubDir(&zipOut, what_to_zip, parent_dir, true, addedFiles))
|
|
|
|
{
|
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(runnableJar.filePath());
|
|
|
|
emitFailed("Failed to add " + filename.fileName() + " to the jar");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
qDebug() << "Adding folder " << filename.fileName() << " from " << filename.absoluteFilePath();
|
2013-08-14 07:13:41 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-28 20:52:19 +01:00
|
|
|
if(!MergeZipFiles(&zipOut, baseJar, addedFiles, LegacyUpdate::IgnoreMetainf))
|
2013-08-24 02:09:46 +01:00
|
|
|
{
|
|
|
|
zipOut.close();
|
|
|
|
QFile::remove(runnableJar.filePath());
|
|
|
|
emitFailed("Failed to insert minecraft.jar contents.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-08-14 07:13:41 +01:00
|
|
|
// Recompress the jar
|
2013-08-24 02:09:46 +01:00
|
|
|
zipOut.close();
|
|
|
|
if(zipOut.getZipError()!=0)
|
|
|
|
{
|
|
|
|
QFile::remove(runnableJar.filePath());
|
|
|
|
emitFailed("Failed to finalize minecraft.jar!");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
inst->setShouldRebuild(false);
|
|
|
|
//inst->UpdateVersion(true);
|
|
|
|
emitSucceeded();
|
|
|
|
return;
|
2013-08-14 07:13:41 +01:00
|
|
|
}
|