From e118b1f9901d8d006dbe268b4b4047de27e4531d Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Mon, 19 May 2014 02:22:09 +0200 Subject: Implement adding jar mods, break saving library order. --- logic/forge/ForgeInstaller.cpp | 6 +++--- logic/forge/ForgeInstaller.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'logic/forge') diff --git a/logic/forge/ForgeInstaller.cpp b/logic/forge/ForgeInstaller.cpp index 0e7b26f7..7f952408 100644 --- a/logic/forge/ForgeInstaller.cpp +++ b/logic/forge/ForgeInstaller.cpp @@ -14,7 +14,7 @@ */ #include "ForgeInstaller.h" -#include "logic/minecraft/VersionFinal.h" +#include "logic/minecraft/InstanceVersion.h" #include "logic/minecraft/OneSixLibrary.h" #include "logic/net/HttpMetaCache.h" #include "logic/tasks/Task.h" @@ -40,7 +40,7 @@ ForgeInstaller::ForgeInstaller() : BaseInstaller() } void ForgeInstaller::prepare(const QString &filename, const QString &universalUrl) { - std::shared_ptr newVersion; + std::shared_ptr newVersion; m_universal_url = universalUrl; QuaZip zip(filename); @@ -73,7 +73,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr // read the forge version info { - newVersion = VersionFinal::fromJson(versionInfoVal.toObject()); + newVersion = InstanceVersion::fromJson(versionInfoVal.toObject()); if (!newVersion) return; } diff --git a/logic/forge/ForgeInstaller.h b/logic/forge/ForgeInstaller.h index dafa6305..14aeeb51 100644 --- a/logic/forge/ForgeInstaller.h +++ b/logic/forge/ForgeInstaller.h @@ -20,7 +20,7 @@ #include #include -class VersionFinal; +class InstanceVersion; class ForgeInstallTask; class ForgeVersion; @@ -40,7 +40,7 @@ protected: private: // the parsed version json, read from the installer - std::shared_ptr m_forge_json; + std::shared_ptr m_forge_json; // the actual forge version std::shared_ptr m_forge_version; QString internalPath; -- cgit