diff options
Diffstat (limited to 'logic/OneSixUpdate.h')
-rw-r--r-- | logic/OneSixUpdate.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/logic/OneSixUpdate.h b/logic/OneSixUpdate.h index a66da067..b86c205f 100644 --- a/logic/OneSixUpdate.h +++ b/logic/OneSixUpdate.h @@ -21,6 +21,7 @@ #include "logic/net/NetJob.h" #include "logic/tasks/Task.h" +#include "logic/JavaChecker.h" class MinecraftVersion; class BaseInstance; @@ -29,7 +30,7 @@ class OneSixUpdate : public Task { Q_OBJECT public: - explicit OneSixUpdate(BaseInstance *inst, QObject *parent = 0); + explicit OneSixUpdate(BaseInstance *inst, bool prepare_for_launch, QObject *parent = 0); virtual void executeTask(); private @@ -42,11 +43,20 @@ slots: void jarlibFinished(); void jarlibFailed(); + void checkJava(); + void checkFinished(JavaCheckResult result); + + // extract the appropriate libraries + void prepareForLaunch(); private: NetJobPtr specificVersionDownloadJob; NetJobPtr jarlibDownloadJob; // target version, determined during this task std::shared_ptr<MinecraftVersion> targetVersion; - BaseInstance *m_inst; + BaseInstance *m_inst = nullptr; + bool m_prepare_for_launch = false; + std::shared_ptr<JavaChecker> checker; + + bool java_is_64bit = false; }; |