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

Detect java bitness on launch, use appropriate libraries

Browse Source 
Fixes problems with latest snapshot
This commit is contained in:
Petr Mrázek
2013-11-25 00:46:52 +01:00
parent 82225a21e1
commit 088b039cf7
10 changed files with 163 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
logic/OneSixInstance.h
View File

@ -37,23 +37,22 @@ public:
////// Directories //////
QString resourcePacksDir() const;
QString loaderModsDir() const;
virtual QString instanceConfigFolder() const;
virtual QString instanceConfigFolder() const override;
virtual Task *doUpdate();
virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account);
virtual Task *doUpdate(bool prepare_for_launch) override;
virtual MinecraftProcess *prepareForLaunch(MojangAccountPtr account) override;
virtual void cleanupAfterRun();
virtual void cleanupAfterRun() override;
virtual QString intendedVersionId() const;
virtual bool setIntendedVersionId(QString version);
virtual QString intendedVersionId() const override;
virtual bool setIntendedVersionId(QString version) override;
virtual QString currentVersionId() const;
// virtual void setCurrentVersionId ( QString val ) {};
virtual QString currentVersionId() const override;
virtual bool shouldUpdate() const;
virtual void setShouldUpdate(bool val);
virtual bool shouldUpdate() const override;
virtual void setShouldUpdate(bool val) override;
virtual QDialog *createModEditDialog(QWidget *parent);
virtual QDialog *createModEditDialog(QWidget *parent) override;
/// reload the full version json file. return true on success!
bool reloadFullVersion();
@ -66,11 +65,11 @@ public:
/// is the current version original, or custom?
virtual bool versionIsCustom() override;
virtual QString defaultBaseJar() const;
virtual QString defaultCustomBaseJar() const;
virtual QString defaultBaseJar() const override;
virtual QString defaultCustomBaseJar() const override;
virtual bool menuActionEnabled(QString action_name) const;
virtual QString getStatusbarDescription();
virtual bool menuActionEnabled(QString action_name) const override;
virtual QString getStatusbarDescription() override;
private:
QStringList processMinecraftArgs(MojangAccountPtr account);