ca297fca79
Added missing licenses
Added a Java functionality checker (detects 32/64bit java)
Refactor of *Update - no longer based on BaseUpdate, but Task directly
Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there.
Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there.
Used the Java checker in the main settings dialog (TODO: instance settings).
Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded.
33 lines
599 B
C++
33 lines
599 B
C++
#pragma once
|
|
#include <QProcess>
|
|
#include <QTimer>
|
|
#include <memory>
|
|
|
|
struct JavaCheckResult
|
|
{
|
|
QString mojangPlatform;
|
|
QString realPlatform;
|
|
bool valid = false;
|
|
bool is_64bit = false;
|
|
};
|
|
typedef std::shared_ptr<QProcess> QProcessPtr;
|
|
|
|
class JavaChecker : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit JavaChecker(QObject *parent = 0);
|
|
int performCheck(QString path);
|
|
|
|
signals:
|
|
void checkFinished(JavaCheckResult result);
|
|
private:
|
|
QProcessPtr process;
|
|
QTimer killTimer;
|
|
public
|
|
slots:
|
|
void timeout();
|
|
void finished(int exitcode, QProcess::ExitStatus);
|
|
void error(QProcess::ProcessError);
|
|
};
|