summaryrefslogtreecommitdiffstats
path: root/logic/minecraft/MinecraftVersion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'logic/minecraft/MinecraftVersion.cpp')
-rw-r--r--logic/minecraft/MinecraftVersion.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/logic/minecraft/MinecraftVersion.cpp b/logic/minecraft/MinecraftVersion.cpp
index bd53997b..32682bfb 100644
--- a/logic/minecraft/MinecraftVersion.cpp
+++ b/logic/minecraft/MinecraftVersion.cpp
@@ -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)
+{
+ getVersionFile()->applyTo(version);
+}
+
+VersionFilePtr MinecraftVersion::getVersionFile()
{
QFileInfo versionFile(QString("versions/%1/%1.dat").arg(m_descriptor));
-
- auto versionObj = VersionBuilder::parseBinaryJsonFile(versionFile);
- versionObj->applyTo(version);
+
+ return ProfileUtils::parseBinaryJsonFile(versionFile);
}
-void MinecraftVersion::applyTo(InstanceVersion *version)
+
+void MinecraftVersion::applyTo(MinecraftProfile *version)
{
// do we have this one cached?
if (m_versionSource == Local)