Revert all the disaster

This commit is contained in:
Sebastian-byte
2021-07-13 19:50:52 -05:00
parent 869a92b2a2
commit 59ffdc8ff6
105 changed files with 4816 additions and 403 deletions

View File

@@ -11,6 +11,8 @@
#include <BaseInstance.h>
#include "minecraft/launch/MinecraftServerTarget.h"
class LaunchController;
class LocalPeer;
class InstanceWindow;
@@ -151,7 +153,12 @@ signals:
void globalSettingsClosed();
public slots:
bool launch(InstancePtr instance, bool online = true, BaseProfilerFactory *profiler = nullptr);
bool launch(
InstancePtr instance,
bool online = true,
BaseProfilerFactory *profiler = nullptr,
MinecraftServerTargetPtr serverToJoin = nullptr
);
bool kill(InstancePtr instance);
private slots:
@@ -223,6 +230,7 @@ private:
SetupWizard * m_setupWizard = nullptr;
public:
QString m_instanceIdToLaunch;
QString m_serverToJoin;
bool m_liveCheck = false;
QUrl m_zipToImport;
std::unique_ptr<QFile> logFile;