summaryrefslogtreecommitdiffstats
path: root/logic/forge
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-05-19 02:22:09 +0200
committerPetr Mrázek <peterix@gmail.com>2014-06-09 01:38:31 +0200
commite118b1f9901d8d006dbe268b4b4047de27e4531d (patch)
tree6267039d1ff6047544ac98568f6382f751d93d35 /logic/forge
parent55a0d110b654a93ef1bb9ee50a6f02ecaec7f88d (diff)
downloadMultiMC-e118b1f9901d8d006dbe268b4b4047de27e4531d.tar
MultiMC-e118b1f9901d8d006dbe268b4b4047de27e4531d.tar.gz
MultiMC-e118b1f9901d8d006dbe268b4b4047de27e4531d.tar.lz
MultiMC-e118b1f9901d8d006dbe268b4b4047de27e4531d.tar.xz
MultiMC-e118b1f9901d8d006dbe268b4b4047de27e4531d.zip
Implement adding jar mods, break saving library order.
Diffstat (limited to 'logic/forge')
-rw-r--r--logic/forge/ForgeInstaller.cpp6
-rw-r--r--logic/forge/ForgeInstaller.h4
2 files changed, 5 insertions, 5 deletions
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<VersionFinal> newVersion;
+ std::shared_ptr<InstanceVersion> 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 <QString>
#include <memory>
-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<VersionFinal> m_forge_json;
+ std::shared_ptr<InstanceVersion> m_forge_json;
// the actual forge version
std::shared_ptr<ForgeVersion> m_forge_version;
QString internalPath;