0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE preserve minecraft.jar while migrating Legacy instances

Browse Source 
It can be manually modded. It must be preserved when it's the only jar around.
This commit is contained in:
Petr Mrázek 2018-03-23 23:38:08 +01:00
parent 106155dd62
commit a1c713811c
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/logic/minecraft/legacy/LegacyInstance.cpp
View File

@ -44,6 +44,26 @@ LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectP
settings->registerSetting("CustomBaseJar", "");
}
QString LegacyInstance::mainJarToPreserve() const
{
bool customJar = m_settings->get("UseCustomBaseJar").toBool();
if(customJar)
{
auto base = baseJar();
if(QFile::exists(base))
{
return base;
}
}
auto runnable = runnableJar();
if(QFile::exists(runnable))
{
return runnable;
}
return QString();
}
QString LegacyInstance::baseJar() const
{
bool customJar = m_settings->get("UseCustomBaseJar").toBool();

3
api/logic/minecraft/legacy/LegacyInstance.h
View File

@ -64,6 +64,9 @@ public:
/// the default custom base jar of this instance
QString defaultCustomBaseJar() const;
// the main jar that we actually want to keep when migrating the instance
QString mainJarToPreserve() const;
/*!
* Whether or not custom base jar is used
*/

6
api/logic/minecraft/legacy/LegacyUpgradeTask.cpp
View File

@ -92,10 +92,10 @@ void LegacyUpgradeTask::copyFinished()
components->buildingFromScratch();
components->setComponentVersion("net.minecraft", preferredVersionNumber, true);
if(legacyInst->shouldUseCustomBaseJar())
QString jarPath = legacyInst->mainJarToPreserve();
if(!jarPath.isNull())
{
QString jarPath = legacyInst->customBaseJar();
qDebug() << "Base jar is custom! : " << jarPath;
qDebug() << "Preserving base jar! : " << jarPath;
// FIXME: handle case when the jar is unreadable?
// TODO: check the hash, if it's the same as the upstream jar, do not do this
components->installCustomJar(jarPath);