diff --git a/src/app/backend/backend.cpp b/src/app/backend/backend.cpp index cb1c338..32ecef6 100644 --- a/src/app/backend/backend.cpp +++ b/src/app/backend/backend.cpp @@ -86,7 +86,7 @@ void Backend::authWithPassword( QString &username, QString &password, bool &session_save_flag, std::function callback) { - QString url = "http://root-kit.ru:3001/punkcraft/session/auth"; + QString url = "https://root-kit.ru:3002/punkcraft/session/auth"; QJsonObject payload; payload["username"] = username; payload["password"] = password; @@ -130,7 +130,7 @@ void Backend::authWithToken(std::function callb QString uuid = savedData["uuid"].toString(); QString access_token = savedData["access_token"].toString(); - QString url = "http://root-kit.ru:3001/punkcraft/session/auth/token"; + QString url = "https://root-kit.ru:3002/punkcraft/session/auth/token"; QJsonObject payload; payload["uuid"] = uuid; payload["access_token"] = access_token; diff --git a/src/app/launcher/forge1.12.2/getArgs.cpp b/src/app/launcher/forge1.12.2/getArgs.cpp index 5609400..862562f 100644 --- a/src/app/launcher/forge1.12.2/getArgs.cpp +++ b/src/app/launcher/forge1.12.2/getArgs.cpp @@ -19,7 +19,6 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri QStringList arguments; arguments << "-Djava.library.path=./versions/Forge_1.12.2/natives" - //<< "-Xms" + RAM + "M" << "-Xmx" + RAM << "-cp" << "./libraries/net/minecraftforge/forge/1.12.2-14.23.5.2860/" @@ -49,7 +48,7 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri "libraries/net/sf/jopt-simple/jopt-simple/5.0.3/" "jopt-simple-5.0.3.jar:./libraries/org/apache/logging/log4j/log4j-api/" "2.15.0/log4j-api-2.15.0.jar:./libraries/org/apache/logging/log4j/" - "log4j-core/2.15.0/log4j-core-2.15.0.jar:./libraries/org/tlauncher/" + "log4j-core/2.15.0/log4j-core-2.15.0.jar:./libraries/com/mojang/" "patchy/1.3.9/patchy-1.3.9.jar:./libraries/oshi-project/oshi-core/1.1/" "oshi-core-1.1.jar:./libraries/net/java/dev/jna/jna/4.4.0/" "jna-4.4.0.jar:./libraries/net/java/dev/jna/platform/3.4.0/" @@ -98,13 +97,10 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri << "-XX:+AlwaysPreTouch" << "-XX:+UseNUMA" //<< "-XX:+UseFastUnorderedTimeStamps" // Не работает - << "-server" // На счёт него не уверен + //<< "-server" // На счёт него не уверен << "-XX:+PerfDisableSharedMem" << "-XX:AllocatePrefetchStyle=3"; - - - // Garbarge Collector if (garbarge_collector == "CMS (Concurrent Mark-Sweep)") { // CMS (Concurrent Mark-Sweep) @@ -131,11 +127,12 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri << "-XX:MaxHeapSize=2G" << "-XX:InitialHeapSize=1G"; } - + arguments << "net.minecraft.launchwrapper.Launch" << "--username" << username << "--version" << "Forge_1.12.2" + << "--gameDir" << "./" << "--assetsDir" << "./assets" << "--assetIndex" << "1.12" << "--uuid" << uuid @@ -147,7 +144,7 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri << "--versionType" << "Forge" << "--height" << "480" << "--width" << "854"; - + return arguments; } diff --git a/src/app/ui/mainwindow.cpp b/src/app/ui/mainwindow.cpp index 8e14821..5ec6775 100644 --- a/src/app/ui/mainwindow.cpp +++ b/src/app/ui/mainwindow.cpp @@ -181,7 +181,7 @@ void MainWindow::on_start_btn_clicked() { // Обновление переменных запуска клиента QString selected_profile = ui->selected_profile->currentText(); QDir exe_dir(QCoreApplication::applicationDirPath()); - client_dir = exe_dir.absolutePath() + "/../../../mine/" + selected_profile; + client_dir = exe_dir.absolutePath() + "/" + selected_profile; json_settings = settings->loadFromJson(selected_profile); @@ -192,7 +192,7 @@ void MainWindow::on_start_btn_clicked() { // Значения по умолчанию if (selected_profile == "CyberExtrieme") { java_path = java_path.isEmpty() ? - exe_dir.absolutePath() + "/../../../mine/CyberExtrieme/java/zing24.12.0.0-6-jre8.0.432/bin/java" : java_path; + exe_dir.absolutePath() + "/java/zing24.12.0.0-6-jre8.0.432/bin/java" : java_path; RAM = RAM.isEmpty() ? "4096M" : RAM; garbarge_collector = garbarge_collector.isEmpty() ?