diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-05-19 02:22:09 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-09 01:38:31 +0200 |
| commit | e118b1f9901d8d006dbe268b4b4047de27e4531d (patch) | |
| tree | 6267039d1ff6047544ac98568f6382f751d93d35 /logic/OneSixUpdate.cpp | |
| parent | 55a0d110b654a93ef1bb9ee50a6f02ecaec7f88d (diff) | |
| download | MultiMC-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/OneSixUpdate.cpp')
| -rw-r--r-- | logic/OneSixUpdate.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp index 4b37f9aa..abc5f9c1 100644 --- a/logic/OneSixUpdate.cpp +++ b/logic/OneSixUpdate.cpp @@ -27,7 +27,7 @@ #include "logic/BaseInstance.h" #include "logic/minecraft/MinecraftVersionList.h" -#include "logic/minecraft/VersionFinal.h" +#include "logic/minecraft/InstanceVersion.h" #include "logic/minecraft/OneSixLibrary.h" #include "logic/OneSixInstance.h" #include "logic/forge/ForgeMirrors.h" @@ -85,7 +85,7 @@ void OneSixUpdate::assetIndexStart() { setStatus(tr("Updating assets index...")); OneSixInstance *inst = (OneSixInstance *)m_inst; - std::shared_ptr<VersionFinal> version = inst->getFullVersion(); + std::shared_ptr<InstanceVersion> version = inst->getFullVersion(); QString assetName = version->assets; QUrl indexUrl = "http://" + URLConstants::AWS_DOWNLOAD_INDEXES + assetName + ".json"; QString localPath = assetName + ".json"; @@ -109,7 +109,7 @@ void OneSixUpdate::assetIndexFinished() AssetsIndex index; OneSixInstance *inst = (OneSixInstance *)m_inst; - std::shared_ptr<VersionFinal> version = inst->getFullVersion(); + std::shared_ptr<InstanceVersion> version = inst->getFullVersion(); QString assetName = version->assets; QString asset_fname = "assets/indexes/" + assetName + ".json"; @@ -185,7 +185,7 @@ void OneSixUpdate::jarlibStart() } // Build a list of URLs that will need to be downloaded. - std::shared_ptr<VersionFinal> version = inst->getFullVersion(); + std::shared_ptr<InstanceVersion> version = inst->getFullVersion(); // minecraft.jar for this version { QString version_id = version->id; @@ -283,7 +283,7 @@ void OneSixUpdate::jarlibStart() void OneSixUpdate::jarlibFinished() { OneSixInstance *inst = (OneSixInstance *)m_inst; - std::shared_ptr<VersionFinal> version = inst->getFullVersion(); + std::shared_ptr<InstanceVersion> version = inst->getFullVersion(); // create stripped jar, if needed if (version->hasJarMods()) @@ -407,7 +407,7 @@ void OneSixUpdate::fmllibsStart() { // Get the mod list OneSixInstance *inst = (OneSixInstance *)m_inst; - std::shared_ptr<VersionFinal> fullversion = inst->getFullVersion(); + std::shared_ptr<InstanceVersion> fullversion = inst->getFullVersion(); bool forge_present = false; QString version = inst->intendedVersionId(); |