PunkCraft/launcher
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

launcher java class path fix

Browse Source
This commit is contained in:
OpexHunter 2025-01-18 13:58:46 +03:00
parent 3b1baea22d
commit 6a43ad676d
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/backend/backend.cpp
View File

@ -86,7 +86,7 @@ void Backend::authWithPassword(
QString &username, QString &password, bool &session_save_flag, QString &username, QString &password, bool &session_save_flag,
std::function<void(QString, QString, QString)> callback) std::function<void(QString, QString, QString)> callback)
{ {
QString url = "http://root-kit.ru:3001/punkcraft/session/auth"; QString url = "https://root-kit.ru:3002/punkcraft/session/auth";
QJsonObject payload; QJsonObject payload;
payload["username"] = username; payload["username"] = username;
payload["password"] = password; payload["password"] = password;
@ -130,7 +130,7 @@ void Backend::authWithToken(std::function<void(QString, QString, QString)> callb
QString uuid = savedData["uuid"].toString(); QString uuid = savedData["uuid"].toString();
QString access_token = savedData["access_token"].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; QJsonObject payload;
payload["uuid"] = uuid; payload["uuid"] = uuid;
payload["access_token"] = access_token; payload["access_token"] = access_token;

9
src/app/launcher/forge1.12.2/getArgs.cpp
View File

@ -19,7 +19,6 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri
QStringList arguments; QStringList arguments;
arguments arguments
<< "-Djava.library.path=./versions/Forge_1.12.2/natives" << "-Djava.library.path=./versions/Forge_1.12.2/natives"
//<< "-Xms" + RAM + "M"
<< "-Xmx" + RAM << "-Xmx" + RAM
<< "-cp" << "-cp"
<< "./libraries/net/minecraftforge/forge/1.12.2-14.23.5.2860/" << "./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/" "libraries/net/sf/jopt-simple/jopt-simple/5.0.3/"
"jopt-simple-5.0.3.jar:./libraries/org/apache/logging/log4j/log4j-api/" "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/" "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/" "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/" "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/" "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:+AlwaysPreTouch"
<< "-XX:+UseNUMA" << "-XX:+UseNUMA"
//<< "-XX:+UseFastUnorderedTimeStamps" // Не работает //<< "-XX:+UseFastUnorderedTimeStamps" // Не работает
<< "-server" // На счёт него не уверен //<< "-server" // На счёт него не уверен
<< "-XX:+PerfDisableSharedMem" << "-XX:+PerfDisableSharedMem"
<< "-XX:AllocatePrefetchStyle=3"; << "-XX:AllocatePrefetchStyle=3";
// Garbarge Collector // Garbarge Collector
if (garbarge_collector == "CMS (Concurrent Mark-Sweep)") { if (garbarge_collector == "CMS (Concurrent Mark-Sweep)") {
// CMS (Concurrent Mark-Sweep) // CMS (Concurrent Mark-Sweep)
@ -136,6 +132,7 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri
<< "net.minecraft.launchwrapper.Launch" << "net.minecraft.launchwrapper.Launch"
<< "--username" << username << "--username" << username
<< "--version" << "Forge_1.12.2" << "--version" << "Forge_1.12.2"
<< "--gameDir" << "./"
<< "--assetsDir" << "./assets" << "--assetsDir" << "./assets"
<< "--assetIndex" << "1.12" << "--assetIndex" << "1.12"
<< "--uuid" << uuid << "--uuid" << uuid

4
src/app/ui/mainwindow.cpp
View File

@ -181,7 +181,7 @@ void MainWindow::on_start_btn_clicked() {
// Обновление переменных запуска клиента // Обновление переменных запуска клиента
QString selected_profile = ui->selected_profile->currentText(); QString selected_profile = ui->selected_profile->currentText();
QDir exe_dir(QCoreApplication::applicationDirPath()); 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); json_settings = settings->loadFromJson(selected_profile);
@ -192,7 +192,7 @@ void MainWindow::on_start_btn_clicked() {
// Значения по умолчанию // Значения по умолчанию
if (selected_profile == "CyberExtrieme") { if (selected_profile == "CyberExtrieme") {
java_path = java_path.isEmpty() ? 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() ? RAM = RAM.isEmpty() ?
"4096M" : RAM; "4096M" : RAM;
garbarge_collector = garbarge_collector.isEmpty() ? garbarge_collector = garbarge_collector.isEmpty() ?