FML update

This commit is contained in:
OpexHunter 2025-01-19 22:15:01 +03:00
parent 6a43ad676d
commit 60f179750b

View File

@ -18,71 +18,60 @@ getArgs::~getArgs() {
QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QString &uuid, QString &access_token, QString &garbarge_collector) { QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QString &uuid, QString &access_token, QString &garbarge_collector) {
QStringList arguments; QStringList arguments;
arguments arguments
<< "-Djava.library.path=./versions/Forge_1.12.2/natives" << "-Djava.library.path=./versions/1.12.2-forge-14.23.5.2860/natives"
<< "-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/forge-1.12.2-14.23.5.2860.jar:"
"forge-1.12.2-14.23.5.2860.jar:./libraries/org/ow2/asm/asm-debug-all/" "./libraries/org/ow2/asm/asm-debug-all/5.2/asm-debug-all-5.2.jar:"
"5.2/asm-debug-all-5.2.jar:./libraries/net/minecraft/launchwrapper/" "./libraries/net/minecraft/launchwrapper/1.12/launchwrapper-1.12.jar:"
"1.12/launchwrapper-1.12.jar:./libraries/org/jline/jline/3.5.1/" "./libraries/org/jline/jline/3.5.1/jline-3.5.1.jar:"
"jline-3.5.1.jar:./libraries/com/typesafe/akka/akka-actor_2.11/2.3.3/" "./libraries/com/typesafe/akka/akka-actor_2.11/2.3.3/akka-actor_2.11-2.3.3.jar:"
"akka-actor_2.11-2.3.3.jar:./libraries/com/typesafe/config/1.2.1/" "./libraries/com/typesafe/config/1.2.1/config-1.2.1.jar:"
"config-1.2.1.jar:./libraries/org/scala-lang/" "./libraries/org/scala-lang/scala-actors-migration_2.11/1.1.0/scala-actors-migration_2.11-1.1.0.jar:"
"scala-actors-migration_2.11/1.1.0/" "./libraries/org/scala-lang/scala-compiler/2.11.1/scala-compiler-2.11.1.jar:"
"scala-actors-migration_2.11-1.1.0.jar:./libraries/org/scala-lang/" "./libraries/org/scala-lang/plugins/scala-continuations-library_2.11/1.0.2_mc/scala-continuations-library_2.11-1.0.2_mc.jar:"
"scala-compiler/2.11.1/scala-compiler-2.11.1.jar:./libraries/org/" "./libraries/org/scala-lang/plugins/scala-continuations-plugin_2.11.1/1.0.2_mc/scala-continuations-plugin_2.11.1-1.0.2_mc.jar:"
"scala-lang/plugins/scala-continuations-library_2.11/1.0.2_mc/" "./libraries/org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar:"
"scala-continuations-library_2.11-1.0.2_mc.jar:./libraries/org/" "./libraries/org/scala-lang/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar:"
"scala-lang/plugins/scala-continuations-plugin_2.11.1/1.0.2_mc/" "./libraries/org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.jar:"
"scala-continuations-plugin_2.11.1-1.0.2_mc.jar:./libraries/org/" "./libraries/org/scala-lang/scala-swing_2.11/1.0.1/scala-swing_2.11-1.0.1.jar:"
"scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar:./libraries/" "./libraries/org/scala-lang/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar:"
"org/scala-lang/scala-parser-combinators_2.11/1.0.1/" "./libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar:"
"scala-parser-combinators_2.11-1.0.1.jar:./libraries/org/scala-lang/" "./libraries/java3d/vecmath/1.5.2/vecmath-1.5.2.jar:"
"scala-reflect/2.11.1/scala-reflect-2.11.1.jar:./libraries/org/" "./libraries/net/sf/trove4j/trove4j/3.0.3/trove4j-3.0.3.jar:"
"scala-lang/scala-swing_2.11/1.0.1/scala-swing_2.11-1.0.1.jar:./" "./libraries/org/apache/maven/maven-artifact/3.5.3/maven-artifact-3.5.3.jar:"
"libraries/org/scala-lang/scala-xml_2.11/1.0.2/" "./libraries/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar:"
"scala-xml_2.11-1.0.2.jar:./libraries/lzma/lzma/0.0.1/" "./libraries/org/apache/logging/log4j/log4j-api/2.15.0/log4j-api-2.15.0.jar:"
"lzma-0.0.1.jar:./libraries/java3d/vecmath/1.5.2/vecmath-1.5.2.jar:./" "./libraries/org/apache/logging/log4j/log4j-core/2.15.0/log4j-core-2.15.0.jar:"
"libraries/net/sf/trove4j/trove4j/3.0.3/trove4j-3.0.3.jar:./libraries/" "./libraries/com/mojang/patchy/1.3.9/patchy-1.3.9.jar:"
"org/apache/maven/maven-artifact/3.5.3/maven-artifact-3.5.3.jar:./" "./libraries/oshi-project/oshi-core/1.1/oshi-core-1.1.jar:"
"libraries/net/sf/jopt-simple/jopt-simple/5.0.3/" "./libraries/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar:"
"jopt-simple-5.0.3.jar:./libraries/org/apache/logging/log4j/log4j-api/" "./libraries/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar:"
"2.15.0/log4j-api-2.15.0.jar:./libraries/org/apache/logging/log4j/" "./libraries/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar:"
"log4j-core/2.15.0/log4j-core-2.15.0.jar:./libraries/com/mojang/" "./libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar:"
"patchy/1.3.9/patchy-1.3.9.jar:./libraries/oshi-project/oshi-core/1.1/" "./libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar:"
"oshi-core-1.1.jar:./libraries/net/java/dev/jna/jna/4.4.0/" "./libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar:"
"jna-4.4.0.jar:./libraries/net/java/dev/jna/platform/3.4.0/" "./libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar:"
"platform-3.4.0.jar:./libraries/com/ibm/icu/icu4j-core-mojang/51.2/" "./libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar:"
"icu4j-core-mojang-51.2.jar:./libraries/com/paulscode/codecjorbis/" "./libraries/io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar:"
"20101023/codecjorbis-20101023.jar:./libraries/com/paulscode/codecwav/" "./libraries/com/google/guava/guava/21.0/guava-21.0.jar:"
"20101023/codecwav-20101023.jar:./libraries/com/paulscode/" "./libraries/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar:"
"libraryjavasound/20101123/libraryjavasound-20101123.jar:./libraries/" "./libraries/commons-io/commons-io/2.5/commons-io-2.5.jar:"
"com/paulscode/librarylwjglopenal/20100824/" "./libraries/commons-codec/commons-codec/1.10/commons-codec-1.10.jar:"
"librarylwjglopenal-20100824.jar:./libraries/com/paulscode/" "./libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar:"
"soundsystem/20120107/soundsystem-20120107.jar:./libraries/io/netty/" "./libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar:"
"netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar:./libraries/com/" "./libraries/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar:"
"google/guava/guava/21.0/guava-21.0.jar:./libraries/org/apache/" "./libraries/com/mojang/authlib/1.5.25/authlib-1.5.25.jar:"
"commons/commons-lang3/3.5/commons-lang3-3.5.jar:./libraries/" "./libraries/com/mojang/realms/1.10.22/realms-1.10.22.jar:"
"commons-io/commons-io/2.5/commons-io-2.5.jar:./libraries/" "./libraries/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar:"
"commons-codec/commons-codec/1.10/commons-codec-1.10.jar:./libraries/" "./libraries/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar:"
"net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar:./libraries/net/java/" "./libraries/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar:"
"jutils/jutils/1.0.0/jutils-1.0.0.jar:./libraries/com/google/code/" "./libraries/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar:"
"gson/gson/2.8.0/gson-2.8.0.jar:./libraries/com/mojang/authlib/" "./libraries/it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar:"
"1.5.25/authlib-1.5.25.jar:./libraries/com/mojang/realms/1.10.22/" "./libraries/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar:"
"realms-1.10.22.jar:./libraries/org/apache/commons/commons-compress/" "./libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar:"
"1.8.1/commons-compress-1.8.1.jar:./libraries/org/apache/" "./libraries/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar:"
"httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar:./libraries/" "./versions/1.12.2-forge-14.23.5.2860/1.12.2-forge-14.23.5.2860.jar"
"commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar:./"
"libraries/org/apache/httpcomponents/httpcore/4.3.2/"
"httpcore-4.3.2.jar:./libraries/it/unimi/dsi/fastutil/7.1.0/"
"fastutil-7.1.0.jar:./libraries/org/apache/logging/log4j/log4j-api/"
"2.8.1/log4j-api-2.8.1.jar:./libraries/org/apache/logging/log4j/"
"log4j-core/2.8.1/log4j-core-2.8.1.jar:./libraries/org/lwjgl/lwjgl/"
"lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar:./"
"libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/"
"lwjgl_util-2.9.4-nightly-20150209.jar:./libraries/com/mojang/"
"text2speech/1.10.3/text2speech-1.10.3.jar:./versions/Forge_1.12.2/"
"Forge_1.12.2.jar"
<< "-Dfml.ignoreInvalidMinecraftCertificates=true" << "-Dfml.ignoreInvalidMinecraftCertificates=true"
<< "-Dfml.ignorePatchDiscrepancies=true" << "-Dfml.ignorePatchDiscrepancies=true"
@ -131,10 +120,10 @@ QStringList getArgs::getCrossPlatformArgs(QString &RAM, QString &username, QStri
arguments arguments
<< "net.minecraft.launchwrapper.Launch" << "net.minecraft.launchwrapper.Launch"
<< "--username" << username << "--username" << username
<< "--version" << "Forge_1.12.2" << "--version" << "1.12.2-forge-14.23.5.2860"
<< "--gameDir" << "./" << "--gameDir" << "./"
<< "--assetsDir" << "./assets" << "--assetsDir" << "./assets"
<< "--assetIndex" << "1.12" //<< "--assetIndex" << "1.12"
<< "--uuid" << uuid << "--uuid" << uuid
<< "--accessToken" << access_token << "--accessToken" << access_token
<< "--userType" << "mojang" << "--userType" << "mojang"