From 1fbe03f982f130bf675b7f94dd9c06aee62da54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 10 Mar 2017 23:34:03 +0100 Subject: [PATCH] NOISSUE remove unused wonkoclient --- CMakeLists.txt | 1 - wonkoclient/CMakeLists.txt | 10 ----- wonkoclient/WonkoClient.cpp | 84 ------------------------------------- wonkoclient/WonkoClient.h | 36 ---------------- wonkoclient/main.cpp | 29 ------------- 5 files changed, 160 deletions(-) delete mode 100644 wonkoclient/CMakeLists.txt delete mode 100644 wonkoclient/WonkoClient.cpp delete mode 100644 wonkoclient/WonkoClient.h delete mode 100644 wonkoclient/main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index d3dcac78..86f8e20a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,4 +109,3 @@ add_subdirectory(api/logic) add_subdirectory(api/gui) add_subdirectory(application) -add_subdirectory(wonkoclient) diff --git a/wonkoclient/CMakeLists.txt b/wonkoclient/CMakeLists.txt deleted file mode 100644 index 381857e0..00000000 --- a/wonkoclient/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -project(wonkoclient) - -SET( SRC_FILES -main.cpp -WonkoClient.cpp -WonkoClient.h -) - -add_executable(MMCClient ${SRC_FILES}) -target_link_libraries(MMCClient MultiMC_logic) diff --git a/wonkoclient/WonkoClient.cpp b/wonkoclient/WonkoClient.cpp deleted file mode 100644 index a45939b3..00000000 --- a/wonkoclient/WonkoClient.cpp +++ /dev/null @@ -1,84 +0,0 @@ -// -// Created by robotbrain on 3/27/16. -// - -#include -#include -#include -#include -#include -#include -#include -#include "WonkoClient.h" - -WonkoClient &WonkoClient::getInstance() { - static WonkoClient instance; - return instance; -} - -void WonkoClient::registerLists() { - ENV.initHttpMetaCache(); - auto mcList = std::make_shared(); - ENV.registerVersionList("net.minecraft", mcList); - runTask(mcList->getLoadTask()); - auto llList = std::make_shared(); - ENV.registerVersionList("com.mumfrey.liteloader", llList); - runTask(llList->getLoadTask()); - auto forgeList = std::make_shared(); - ENV.registerVersionList("net.minecraftforge", forgeList); - runTask(forgeList->getLoadTask()); - auto lwjglList = std::make_shared(); - ENV.registerVersionList("org.lwjgl.legacy", lwjglList); - runTask(lwjglList->getLoadTask()); - auto javaList = std::make_shared(); - ENV.registerVersionList("com.java", javaList); -} - -WonkoClient::WonkoClient() { - m_settings.reset(new INISettingsObject("multimc.cfg", this)); - m_instanceList.reset(new InstanceList(m_settings, ".", this)); -} - -void WonkoClient::runTask(Task *pTask) { - if (pTask == nullptr) - return; - QEventLoop loop; - QObject::connect(pTask, &Task::finished, &loop, &QEventLoop::quit); - pTask->start(); - loop.exec(); - delete pTask; -} - -void WonkoClient::initGlobalSettings() -{ - m_settings->registerSetting("ShowConsole", true); - m_settings->registerSetting("AutoCloseConsole", true); - m_settings->registerSetting("LogPrePostOutput", true); - // Window Size - m_settings->registerSetting({"LaunchMaximized", "MCWindowMaximize"}, false); - m_settings->registerSetting({"MinecraftWinWidth", "MCWindowWidth"}, 854); - m_settings->registerSetting({"MinecraftWinHeight", "MCWindowHeight"}, 480); - - // Memory - m_settings->registerSetting({"MinMemAlloc", "MinMemoryAlloc"}, 512); - m_settings->registerSetting({"MaxMemAlloc", "MaxMemoryAlloc"}, 1024); - m_settings->registerSetting("PermGen", 128); - - // Java Settings - m_settings->registerSetting("JavaPath", ""); - m_settings->registerSetting("JavaTimestamp", 0); - m_settings->registerSetting("JavaArchitecture", ""); - m_settings->registerSetting("JavaVersion", ""); - m_settings->registerSetting("LastHostname", ""); - m_settings->registerSetting("JvmArgs", ""); - - // Wrapper command for launch - m_settings->registerSetting("WrapperCommand", ""); - - // Custom Commands - m_settings->registerSetting({"PreLaunchCommand", "PreLaunchCmd"}, ""); - m_settings->registerSetting({"PostExitCommand", "PostExitCmd"}, ""); - - // Minecraft launch method - m_settings->registerSetting("MCLaunchMethod", "LauncherPart"); -} diff --git a/wonkoclient/WonkoClient.h b/wonkoclient/WonkoClient.h deleted file mode 100644 index e6b35805..00000000 --- a/wonkoclient/WonkoClient.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// Created by robotbrain on 3/27/16. -// - -#pragma once - -#include -#include - -#if defined(MMCC) -#undef MMCC -#endif -#define MMCC (WonkoClient::getInstance()) - -class WonkoClient : public QObject { -Q_OBJECT - -private: - WonkoClient(); - -public: - static WonkoClient &getInstance(); - - void registerLists(); - void initGlobalSettings(); - - std::shared_ptr instances() const { - return m_instanceList; - } - -private: - std::shared_ptr m_instanceList; - std::shared_ptr m_settings; - - void runTask(Task *pTask); -}; diff --git a/wonkoclient/main.cpp b/wonkoclient/main.cpp deleted file mode 100644 index eaf92c5d..00000000 --- a/wonkoclient/main.cpp +++ /dev/null @@ -1,29 +0,0 @@ -// -// Created by robotbrain on 3/26/16. -// - -#include "WonkoClient.h" -#include -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - QCoreApplication a(argc, argv); - if (a.arguments().contains("-d")) - { - int i = a.arguments().lastIndexOf("-d") + 1; - if (i < a.arguments().length()) - { - QDir dir = QDir::current(); - dir.cd(a.arguments()[i]); - QDir::setCurrent(dir.absolutePath()); - qDebug() << "Using " << dir.absolutePath(); - } - } - MMCC.initGlobalSettings(); - MMCC.registerLists(); - return a.exec(); -}