diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-12-18 02:48:14 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-12-27 20:50:33 +0100 |
| commit | a30a9559c749446165ec84e737fe85b44a462584 (patch) | |
| tree | 9e6bfadfc4e10f01ab2580c33e2c682d57b4ce99 /logic/OneSixInstance.h | |
| parent | 01f44e0f39a808d3d5285c394d83a8fc80421890 (diff) | |
| download | MultiMC-a30a9559c749446165ec84e737fe85b44a462584.tar MultiMC-a30a9559c749446165ec84e737fe85b44a462584.tar.gz MultiMC-a30a9559c749446165ec84e737fe85b44a462584.tar.lz MultiMC-a30a9559c749446165ec84e737fe85b44a462584.tar.xz MultiMC-a30a9559c749446165ec84e737fe85b44a462584.zip | |
NOISSUE Fix jar mods for OnesSix
Diffstat (limited to 'logic/OneSixInstance.h')
| -rw-r--r-- | logic/OneSixInstance.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h index d751ffc8..70726208 100644 --- a/logic/OneSixInstance.h +++ b/logic/OneSixInstance.h @@ -42,7 +42,7 @@ public: std::shared_ptr<ModList> texturePackList() override; virtual QSet<QString> traits(); - + ////// Directories and files ////// QString jarModsDir() const; QString resourcePacksDir() const; @@ -67,26 +67,23 @@ public: /** * reload the full version json files. - * + * * throws various exceptions :3 */ void reloadVersion(); - + /// clears all version information in preparation for an update void clearVersion(); - + /// get the current full version info std::shared_ptr<InstanceVersion> getFullVersion() const; - + /// is the current version original, or custom? virtual bool versionIsCustom() override; - + /// does this instance have an FTB pack patch inside? bool versionIsFTBPack(); - virtual QString defaultBaseJar() const override; - virtual QString defaultCustomBaseJar() const override; - virtual QString getStatusbarDescription() override; virtual QDir jarmodsPath() const; @@ -107,6 +104,14 @@ signals: private: QStringList processMinecraftArgs(AuthSessionPtr account); QDir reconstructAssets(std::shared_ptr<InstanceVersion> version); + +protected: + std::shared_ptr<InstanceVersion> version; + std::shared_ptr<ModList> jar_mod_list; + std::shared_ptr<ModList> loader_mod_list; + std::shared_ptr<ModList> core_mod_list; + std::shared_ptr<ModList> resource_pack_list; + std::shared_ptr<ModList> texture_pack_list; }; Q_DECLARE_METATYPE(std::shared_ptr<OneSixInstance>) |