NOISSUE Refactors and moving of things

This commit is contained in:
Petr Mrázek
2015-01-27 22:31:07 +01:00
parent 593111b144
commit 791221e923
88 changed files with 1894 additions and 1668 deletions

View File

@ -1,7 +1,8 @@
#include "MinecraftVersion.h"
#include "InstanceVersion.h"
#include "MinecraftProfile.h"
#include "VersionBuildError.h"
#include "VersionBuilder.h"
#include "ProfileUtils.h"
#include "MultiMC.h"
#include "logic/settings/SettingsObject.h"
@ -56,15 +57,20 @@ bool MinecraftVersion::isMinecraftVersion()
// 1. assume the local file is good. load, check. If it's good, apply.
// 2. if discrepancies are found, fall out and fail (impossible to apply incomplete version).
void MinecraftVersion::applyFileTo(InstanceVersion *version)
void MinecraftVersion::applyFileTo(MinecraftProfile *version)
{
QFileInfo versionFile(QString("versions/%1/%1.dat").arg(m_descriptor));
auto versionObj = VersionBuilder::parseBinaryJsonFile(versionFile);
versionObj->applyTo(version);
getVersionFile()->applyTo(version);
}
void MinecraftVersion::applyTo(InstanceVersion *version)
VersionFilePtr MinecraftVersion::getVersionFile()
{
QFileInfo versionFile(QString("versions/%1/%1.dat").arg(m_descriptor));
return ProfileUtils::parseBinaryJsonFile(versionFile);
}
void MinecraftVersion::applyTo(MinecraftProfile *version)
{
// do we have this one cached?
if (m_versionSource == Local)