CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement adding jar mods, break saving library order.

Browse Source
This commit is contained in:
Petr Mrázek
2014-05-19 02:22:09 +02:00
parent 55a0d110b6
commit e118b1f990
21 changed files with 226 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/forge/ForgeInstaller.cpp
View File

@ -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;
}

4
logic/forge/ForgeInstaller.h
View File

@ -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;