diff --git a/minecraft-launcher-client/Launcher.LaunchGame.cs b/minecraft-launcher-client/Launcher.LaunchGame.cs index 4e2bae1..993f4d9 100644 --- a/minecraft-launcher-client/Launcher.LaunchGame.cs +++ b/minecraft-launcher-client/Launcher.LaunchGame.cs @@ -69,8 +69,8 @@ internal static partial class Launcher private static void LaunchGame(string javapath, string username, string uuid, int maxmemory, int width, int height) => - gameProcess = Process.Start( - $"{javapath}\\java.exe -Xms2048M -Xmx{maxmemory}M" + + gameProcess = Process.Start($"{javapath}\\javaw.exe", + $"-Xms2048M -Xmx{maxmemory}M " + "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 " + "-XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=32M -XX:+DisableExplicitGC -XX:+AlwaysPreTouch " + "-XX:+ParallelRefProcEnabled -Xms2048M -Dfile.encoding=UTF-8 " + @@ -78,99 +78,104 @@ internal static partial class Launcher "-Xss1M -Djava.library.path=.\\versions\\1.19.2-forge-43.1.30\\natives " + "-Dminecraft.launcher.brand=java-minecraft-launcher -Dminecraft.launcher.version=1.6.84-j " + "-cp " + - ".\\libraries\\cpw\\mods\\securejarhandler\\2.1.4\\securejarhandler-2.1.4.jar; " + - ".\\libraries\\org\\ow2\\asm\\asm\\9.3\\asm-9.3.jar; " + - ".\\libraries\\org\\ow2\\asm\\asm-commons\\9.3\\asm-commons-9.3.jar; " + - ".\\libraries\\org\\ow2\\asm\\asm-tree\\9.3\\asm-tree-9.3.jar; " + - ".\\libraries\\org\\ow2\\asm\\asm-util\\9.3\\asm-util-9.3.jar; " + - ".\\libraries\\org\\ow2\\asm\\asm-analysis\\9.3\\asm-analysis-9.3.jar; " + - ".\\libraries\\net\\minecraftforge\\accesstransformers\\8.0.4\\accesstransformers-8.0.4.jar; " + - ".\\libraries\\org\\antlr\\antlr4-runtime\\4.9.1\\antlr4-runtime-4.9.1.jar; " + - ".\\libraries\\net\\minecraftforge\\eventbus\\6.0.3\\eventbus-6.0.3.jar; " + - ".\\libraries\\net\\minecraftforge\\forgespi\\6.0.0\\forgespi-6.0.0.jar; " + - ".\\libraries\\net\\minecraftforge\\coremods\\5.0.1\\coremods-5.0.1.jar; " + - ".\\libraries\\cpw\\mods\\modlauncher\\10.0.8\\modlauncher-10.0.8.jar; " + - ".\\libraries\\net\\minecraftforge\\unsafe\\0.2.0\\unsafe-0.2.0.jar; " + - ".\\libraries\\com\\electronwill\\night-config\\core\\3.6.4\\core-3.6.4.jar; " + - ".\\libraries\\com\\electronwill\\night-config\\toml\\3.6.4\\toml-3.6.4.jar; " + - ".\\libraries\\org\\apache\\maven\\maven-artifact\\3.8.5\\maven-artifact-3.8.5.jar; " + - ".\\libraries\\net\\jodah\\typetools\\0.8.3\\typetools-0.8.3.jar; " + - ".\\libraries\\net\\minecrell\\terminalconsoleappender\\1.2.0\\terminalconsoleappender-1.2.0.jar; " + - ".\\libraries\\org\\jline\\jline-reader\\3.12.1\\jline-reader-3.12.1.jar; " + - ".\\libraries\\org\\jline\\jline-terminal\\3.12.1\\jline-terminal-3.12.1.jar; " + - ".\\libraries\\org\\spongepowered\\mixin\\0.8.5\\mixin-0.8.5.jar; " + - ".\\libraries\\org\\openjdk\\nashorn\\nashorn-core\\15.3\\nashorn-core-15.3.jar; " + - ".\\libraries\\net\\minecraftforge\\JarJarSelector\\0.3.16\\JarJarSelector-0.3.16.jar; " + - ".\\libraries\\net\\minecraftforge\\JarJarMetadata\\0.3.16\\JarJarMetadata-0.3.16.jar; " + - ".\\libraries\\cpw\\mods\\bootstraplauncher\\1.1.2\\bootstraplauncher-1.1.2.jar; " + - ".\\libraries\\net\\minecraftforge\\JarJarFileSystems\\0.3.16\\JarJarFileSystems-0.3.16.jar; " + - ".\\libraries\\net\\minecraftforge\\fmlloader\\1.19.2-43.1.30\\fmlloader-1.19.2-43.1.30.jar; " + - ".\\libraries\\com\\mojang\\logging\\1.0.0\\logging-1.0.0.jar; " + - ".\\libraries\\com\\mojang\\blocklist\\1.0.10\\blocklist-1.0.10.jar; " + - ".\\libraries\\ru\\tln4\\empty\\0.1\\empty-0.1.jar; " + - ".\\libraries\\com\\github\\oshi\\oshi-core\\5.8.5\\oshi-core-5.8.5.jar; " + - ".\\libraries\\net\\java\\dev\\jna\\jna\\5.10.0\\jna-5.10.0.jar; " + - ".\\libraries\\net\\java\\dev\\jna\\jna-platform\\5.10.0\\jna-platform-5.10.0.jar; " + - ".\\libraries\\org\\slf4j\\slf4j-api\\1.8.0-beta4\\slf4j-api-1.8.0-beta4.jar; " + - ".\\libraries\\org\\apache\\logging\\log4j\\log4j-slf4j18-impl\\2.17.0\\log4j-slf4j18-impl-2.17.0.jar; " + - ".\\libraries\\com\\ibm\\icu\\icu4j\\70.1\\icu4j-70.1.jar; " + - ".\\libraries\\com\\mojang\\javabridge\\1.2.24\\javabridge-1.2.24.jar; " + - ".\\libraries\\net\\sf\\jopt-simple\\jopt-simple\\5.0.4\\jopt-simple-5.0.4.jar; " + - ".\\libraries\\io\\netty\\netty-common\\4.1.77.Final\\netty-common-4.1.77.Final.jar; " + - ".\\libraries\\io\\netty\\netty-buffer\\4.1.77.Final\\netty-buffer-4.1.77.Final.jar; " + - ".\\libraries\\io\\netty\\netty-codec\\4.1.77.Final\\netty-codec-4.1.77.Final.jar; " + - ".\\libraries\\io\\netty\\netty-handler\\4.1.77.Final\\netty-handler-4.1.77.Final.jar; " + - ".\\libraries\\io\\netty\\netty-resolver\\4.1.77.Final\\netty-resolver-4.1.77.Final.jar; " + - ".\\libraries\\io\\netty\\netty-transport\\4.1.77.Final\\netty-transport-4.1.77.Final.jar; " + - ".\\libraries\\io\\netty\\netty-transport-native-unix-common\\4.1.77.Final\\netty-transport-native-unix-common-4.1.77.Final.jar; " + - ".\\libraries\\io\\netty\\netty-transport-classes-epoll\\4.1.77.Final\\netty-transport-classes-epoll-4.1.77.Final.jar; " + - ".\\libraries\\com\\google\\guava\\failureaccess\\1.0.1\\failureaccess-1.0.1.jar; " + - ".\\libraries\\com\\google\\guava\\guava\\31.0.1-jre\\guava-31.0.1-jre.jar; " + - ".\\libraries\\org\\apache\\commons\\commons-lang3\\3.12.0\\commons-lang3-3.12.0.jar; " + - ".\\libraries\\commons-io\\commons-io\\2.11.0\\commons-io-2.11.0.jar; " + - ".\\libraries\\commons-codec\\commons-codec\\1.15\\commons-codec-1.15.jar; " + - ".\\libraries\\com\\mojang\\brigadier\\1.0.18\\brigadier-1.0.18.jar; " + - ".\\libraries\\com\\mojang\\datafixerupper\\5.0.28\\datafixerupper-5.0.28.jar; " + - ".\\libraries\\com\\google\\code\\gson\\gson\\2.8.9\\gson-2.8.9.jar; " + - ".\\libraries\\by\\ely\\authlib\\3.11.49.0\\authlib-3.11.49.0.jar; " + - ".\\libraries\\org\\apache\\commons\\commons-compress\\1.21\\commons-compress-1.21.jar; " + - ".\\libraries\\org\\apache\\httpcomponents\\httpclient\\4.5.13\\httpclient-4.5.13.jar; " + - ".\\libraries\\commons-logging\\commons-logging\\1.2\\commons-logging-1.2.jar; " + - ".\\libraries\\org\\apache\\httpcomponents\\httpcore\\4.4.14\\httpcore-4.4.14.jar; " + - ".\\libraries\\it\\unimi\\dsi\\fastutil\\8.5.6\\fastutil-8.5.6.jar; " + - ".\\libraries\\org\\apache\\logging\\log4j\\log4j-api\\2.17.0\\log4j-api-2.17.0.jar; " + - ".\\libraries\\org\\apache\\logging\\log4j\\log4j-core\\2.17.0\\log4j-core-2.17.0.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl\\3.3.1\\lwjgl-3.3.1.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl\\3.3.1\\lwjgl-3.3.1-natives-windows.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl\\3.3.1\\lwjgl-3.3.1-natives-windows-x86.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-jemalloc\\3.3.1\\lwjgl-jemalloc-3.3.1.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-jemalloc\\3.3.1\\lwjgl-jemalloc-3.3.1-natives-windows.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-jemalloc\\3.3.1\\lwjgl-jemalloc-3.3.1-natives-windows-x86.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-openal\\3.3.1\\lwjgl-openal-3.3.1.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-openal\\3.3.1\\lwjgl-openal-3.3.1-natives-windows.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-openal\\3.3.1\\lwjgl-openal-3.3.1-natives-windows-x86.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-opengl\\3.3.1\\lwjgl-opengl-3.3.1.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-opengl\\3.3.1\\lwjgl-opengl-3.3.1-natives-windows.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-opengl\\3.3.1\\lwjgl-opengl-3.3.1-natives-windows-x86.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-glfw\\3.3.1\\lwjgl-glfw-3.3.1.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-glfw\\3.3.1\\lwjgl-glfw-3.3.1-natives-windows.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-glfw\\3.3.1\\lwjgl-glfw-3.3.1-natives-windows-x86.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-stb\\3.3.1\\lwjgl-stb-3.3.1.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-stb\\3.3.1\\lwjgl-stb-3.3.1-natives-windows.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-stb\\3.3.1\\lwjgl-stb-3.3.1-natives-windows-x86.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-tinyfd\\3.3.1\\lwjgl-tinyfd-3.3.1.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-tinyfd\\3.3.1\\lwjgl-tinyfd-3.3.1-natives-windows.jar; " + - ".\\libraries\\org\\lwjgl\\lwjgl-tinyfd\\3.3.1\\lwjgl-tinyfd-3.3.1-natives-windows-x86.jar; " + - ".\\libraries\\com\\mojang\\text2speech\\1.13.9\\text2speech-1.13.9.jar; " + - ".\\libraries\\com\\mojang\\text2speech\\1.13.9\\text2speech-1.13.9-natives-windows.jar;.\\versions\\1.19.2-forge-43.1.30\\1.19.2-forge-43.1.30.jar -Djava.net.preferIPv6Addresses=system -DignoreList=bootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge-,1.19.2-forge-43.1.30.jar -DmergeModules=jna-5.10.0.jar,jna-platform-5.10.0.jar " + + ".\\libraries\\cpw\\mods\\securejarhandler\\2.1.4\\securejarhandler-2.1.4.jar;" + + ".\\libraries\\org\\ow2\\asm\\asm\\9.3\\asm-9.3.jar;" + + ".\\libraries\\org\\ow2\\asm\\asm-commons\\9.3\\asm-commons-9.3.jar;" + + ".\\libraries\\org\\ow2\\asm\\asm-tree\\9.3\\asm-tree-9.3.jar;" + + ".\\libraries\\org\\ow2\\asm\\asm-util\\9.3\\asm-util-9.3.jar;" + + ".\\libraries\\org\\ow2\\asm\\asm-analysis\\9.3\\asm-analysis-9.3.jar;" + + ".\\libraries\\net\\minecraftforge\\accesstransformers\\8.0.4\\accesstransformers-8.0.4.jar;" + + ".\\libraries\\org\\antlr\\antlr4-runtime\\4.9.1\\antlr4-runtime-4.9.1.jar;" + + ".\\libraries\\net\\minecraftforge\\eventbus\\6.0.3\\eventbus-6.0.3.jar;" + + ".\\libraries\\net\\minecraftforge\\forgespi\\6.0.0\\forgespi-6.0.0.jar;" + + ".\\libraries\\net\\minecraftforge\\coremods\\5.0.1\\coremods-5.0.1.jar;" + + ".\\libraries\\cpw\\mods\\modlauncher\\10.0.8\\modlauncher-10.0.8.jar;" + + ".\\libraries\\net\\minecraftforge\\unsafe\\0.2.0\\unsafe-0.2.0.jar;" + + ".\\libraries\\com\\electronwill\\night-config\\core\\3.6.4\\core-3.6.4.jar;" + + ".\\libraries\\com\\electronwill\\night-config\\toml\\3.6.4\\toml-3.6.4.jar;" + + ".\\libraries\\org\\apache\\maven\\maven-artifact\\3.8.5\\maven-artifact-3.8.5.jar;" + + ".\\libraries\\net\\jodah\\typetools\\0.8.3\\typetools-0.8.3.jar;" + + ".\\libraries\\net\\minecrell\\terminalconsoleappender\\1.2.0\\terminalconsoleappender-1.2.0.jar;" + + ".\\libraries\\org\\jline\\jline-reader\\3.12.1\\jline-reader-3.12.1.jar;" + + ".\\libraries\\org\\jline\\jline-terminal\\3.12.1\\jline-terminal-3.12.1.jar;" + + ".\\libraries\\org\\spongepowered\\mixin\\0.8.5\\mixin-0.8.5.jar;" + + ".\\libraries\\org\\openjdk\\nashorn\\nashorn-core\\15.3\\nashorn-core-15.3.jar;" + + ".\\libraries\\net\\minecraftforge\\JarJarSelector\\0.3.16\\JarJarSelector-0.3.16.jar;" + + ".\\libraries\\net\\minecraftforge\\JarJarMetadata\\0.3.16\\JarJarMetadata-0.3.16.jar;" + + ".\\libraries\\cpw\\mods\\bootstraplauncher\\1.1.2\\bootstraplauncher-1.1.2.jar;" + + ".\\libraries\\net\\minecraftforge\\JarJarFileSystems\\0.3.16\\JarJarFileSystems-0.3.16.jar;" + + ".\\libraries\\net\\minecraftforge\\fmlloader\\1.19.2-43.1.30\\fmlloader-1.19.2-43.1.30.jar;" + + ".\\libraries\\com\\mojang\\logging\\1.0.0\\logging-1.0.0.jar;" + + ".\\libraries\\com\\mojang\\blocklist\\1.0.10\\blocklist-1.0.10.jar;" + + ".\\libraries\\ru\\tln4\\empty\\0.1\\empty-0.1.jar;" + + ".\\libraries\\com\\github\\oshi\\oshi-core\\5.8.5\\oshi-core-5.8.5.jar;" + + ".\\libraries\\net\\java\\dev\\jna\\jna\\5.10.0\\jna-5.10.0.jar;" + + ".\\libraries\\net\\java\\dev\\jna\\jna-platform\\5.10.0\\jna-platform-5.10.0.jar;" + + ".\\libraries\\org\\slf4j\\slf4j-api\\1.8.0-beta4\\slf4j-api-1.8.0-beta4.jar;" + + ".\\libraries\\org\\apache\\logging\\log4j\\log4j-slf4j18-impl\\2.17.0\\log4j-slf4j18-impl-2.17.0.jar;" + + ".\\libraries\\com\\ibm\\icu\\icu4j\\70.1\\icu4j-70.1.jar;" + + ".\\libraries\\com\\mojang\\javabridge\\1.2.24\\javabridge-1.2.24.jar;" + + ".\\libraries\\net\\sf\\jopt-simple\\jopt-simple\\5.0.4\\jopt-simple-5.0.4.jar;" + + ".\\libraries\\io\\netty\\netty-common\\4.1.77.Final\\netty-common-4.1.77.Final.jar;" + + ".\\libraries\\io\\netty\\netty-buffer\\4.1.77.Final\\netty-buffer-4.1.77.Final.jar;" + + ".\\libraries\\io\\netty\\netty-codec\\4.1.77.Final\\netty-codec-4.1.77.Final.jar;" + + ".\\libraries\\io\\netty\\netty-handler\\4.1.77.Final\\netty-handler-4.1.77.Final.jar;" + + ".\\libraries\\io\\netty\\netty-resolver\\4.1.77.Final\\netty-resolver-4.1.77.Final.jar;" + + ".\\libraries\\io\\netty\\netty-transport\\4.1.77.Final\\netty-transport-4.1.77.Final.jar;" + + ".\\libraries\\io\\netty\\netty-transport-native-unix-common\\4.1.77.Final\\netty-transport-native-unix-common-4.1.77.Final.jar;" + + ".\\libraries\\io\\netty\\netty-transport-classes-epoll\\4.1.77.Final\\netty-transport-classes-epoll-4.1.77.Final.jar;" + + ".\\libraries\\com\\google\\guava\\failureaccess\\1.0.1\\failureaccess-1.0.1.jar;" + + ".\\libraries\\com\\google\\guava\\guava\\31.0.1-jre\\guava-31.0.1-jre.jar;" + + ".\\libraries\\org\\apache\\commons\\commons-lang3\\3.12.0\\commons-lang3-3.12.0.jar;" + + ".\\libraries\\commons-io\\commons-io\\2.11.0\\commons-io-2.11.0.jar;" + + ".\\libraries\\commons-codec\\commons-codec\\1.15\\commons-codec-1.15.jar;" + + ".\\libraries\\com\\mojang\\brigadier\\1.0.18\\brigadier-1.0.18.jar;" + + ".\\libraries\\com\\mojang\\datafixerupper\\5.0.28\\datafixerupper-5.0.28.jar;" + + ".\\libraries\\com\\google\\code\\gson\\gson\\2.8.9\\gson-2.8.9.jar;" + + ".\\libraries\\by\\ely\\authlib\\3.11.49.0\\authlib-3.11.49.0.jar;" + + ".\\libraries\\org\\apache\\commons\\commons-compress\\1.21\\commons-compress-1.21.jar;" + + ".\\libraries\\org\\apache\\httpcomponents\\httpclient\\4.5.13\\httpclient-4.5.13.jar;" + + ".\\libraries\\commons-logging\\commons-logging\\1.2\\commons-logging-1.2.jar;" + + ".\\libraries\\org\\apache\\httpcomponents\\httpcore\\4.4.14\\httpcore-4.4.14.jar;" + + ".\\libraries\\it\\unimi\\dsi\\fastutil\\8.5.6\\fastutil-8.5.6.jar;" + + ".\\libraries\\org\\apache\\logging\\log4j\\log4j-api\\2.17.0\\log4j-api-2.17.0.jar;" + + ".\\libraries\\org\\apache\\logging\\log4j\\log4j-core\\2.17.0\\log4j-core-2.17.0.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl\\3.3.1\\lwjgl-3.3.1.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl\\3.3.1\\lwjgl-3.3.1-natives-windows.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl\\3.3.1\\lwjgl-3.3.1-natives-windows-x86.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-jemalloc\\3.3.1\\lwjgl-jemalloc-3.3.1.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-jemalloc\\3.3.1\\lwjgl-jemalloc-3.3.1-natives-windows.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-jemalloc\\3.3.1\\lwjgl-jemalloc-3.3.1-natives-windows-x86.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-openal\\3.3.1\\lwjgl-openal-3.3.1.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-openal\\3.3.1\\lwjgl-openal-3.3.1-natives-windows.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-openal\\3.3.1\\lwjgl-openal-3.3.1-natives-windows-x86.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-opengl\\3.3.1\\lwjgl-opengl-3.3.1.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-opengl\\3.3.1\\lwjgl-opengl-3.3.1-natives-windows.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-opengl\\3.3.1\\lwjgl-opengl-3.3.1-natives-windows-x86.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-glfw\\3.3.1\\lwjgl-glfw-3.3.1.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-glfw\\3.3.1\\lwjgl-glfw-3.3.1-natives-windows.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-glfw\\3.3.1\\lwjgl-glfw-3.3.1-natives-windows-x86.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-stb\\3.3.1\\lwjgl-stb-3.3.1.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-stb\\3.3.1\\lwjgl-stb-3.3.1-natives-windows.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-stb\\3.3.1\\lwjgl-stb-3.3.1-natives-windows-x86.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-tinyfd\\3.3.1\\lwjgl-tinyfd-3.3.1.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-tinyfd\\3.3.1\\lwjgl-tinyfd-3.3.1-natives-windows.jar;" + + ".\\libraries\\org\\lwjgl\\lwjgl-tinyfd\\3.3.1\\lwjgl-tinyfd-3.3.1-natives-windows-x86.jar;" + + ".\\libraries\\com\\mojang\\text2speech\\1.13.9\\text2speech-1.13.9.jar;" + + ".\\libraries\\com\\mojang\\text2speech\\1.13.9\\text2speech-1.13.9-natives-windows.jar;" + + ".\\versions\\1.19.2-forge-43.1.30\\1.19.2-forge-43.1.30.jar " + + "-Djava.net.preferIPv6Addresses=system " + + "-DignoreList=bootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm," + + "JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage," + + "forge-,1.19.2-forge-43.1.30.jar -DmergeModules=jna-5.10.0.jar,jna-platform-5.10.0.jar " + "-DlibraryDirectory=.\\libraries -p " + - ".\\libraries/cpw/mods/bootstraplauncher/1.1.2/bootstraplauncher-1.1.2.jar; " + - ".\\libraries/cpw/mods/securejarhandler/2.1.4/securejarhandler-2.1.4.jar; " + - ".\\libraries/org/ow2/asm/asm-commons/9.3/asm-commons-9.3.jar; " + - ".\\libraries/org/ow2/asm/asm-util/9.3/asm-util-9.3.jar; " + - ".\\libraries/org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.jar; " + - ".\\libraries/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar; " + - ".\\libraries/org/ow2/asm/asm/9.3/asm-9.3.jar; " + + ".\\libraries/cpw/mods/bootstraplauncher/1.1.2/bootstraplauncher-1.1.2.jar;" + + ".\\libraries/cpw/mods/securejarhandler/2.1.4/securejarhandler-2.1.4.jar;" + + ".\\libraries/org/ow2/asm/asm-commons/9.3/asm-commons-9.3.jar;" + + ".\\libraries/org/ow2/asm/asm-util/9.3/asm-util-9.3.jar;" + + ".\\libraries/org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.jar;" + + ".\\libraries/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.jar;" + + ".\\libraries/org/ow2/asm/asm/9.3/asm-9.3.jar;" + ".\\libraries/net/minecraftforge/JarJarFileSystems/0.3.16/JarJarFileSystems-0.3.16.jar " + " --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar=cpw.mods.securejarhandler " + " --add-opens java.base/java.lang.invoke=cpw.mods.securejarhandler " + diff --git a/minecraft-launcher-client/LauncherConfig.cs b/minecraft-launcher-client/LauncherConfig.cs index 09b69e1..ddeb396 100644 --- a/minecraft-launcher-client/LauncherConfig.cs +++ b/minecraft-launcher-client/LauncherConfig.cs @@ -6,7 +6,7 @@ namespace launcher_client; public class LauncherConfig { public int GameMemory = 3000; - public int GameWindowHeight = 1600; + public int GameWindowHeight = 500; public int GameWindowWidth = 900; public string JavaPath = $"java{Путь.Разд}bin"; public string ServerAddress = "127.0.0.1"; diff --git a/minecraft-launcher-server/Server.cs b/minecraft-launcher-server/Server.cs index b3710ae..3f17a38 100644 --- a/minecraft-launcher-server/Server.cs +++ b/minecraft-launcher-server/Server.cs @@ -1,8 +1,13 @@ using System; using System.Linq; using System.Net; +using System.Net.Http; +using System.Net.Http.Json; using System.Net.Sockets; using System.Text; +using System.Text.Json; +using System.Text.Json.Nodes; +using System.Text.Json.Serialization; using System.Threading; using DTLib; using DTLib.Dtsod; @@ -10,193 +15,208 @@ using DTLib.Extensions; using DTLib.Filesystem; using DTLib.Logging; using DTLib.Network; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; -namespace launcher_server +namespace launcher_server; + +static class Server { - static class Server + private static ConsoleLogger Info = new("logs","info"); + private static ConsoleLogger Error = new("logs","error"); + static readonly Socket mainSocket = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + static DtsodV23 config; + static bool debug; + + static object manifestLocker = new(); + + static void Main(string[] args) { - private static ConsoleLogger Info = new("logs","info"); - private static ConsoleLogger Error = new("logs","error"); - static readonly Socket mainSocket = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); - static DtsodV23 config; - static bool debug; - - static object manifestLocker = new(); - - static void Main(string[] args) + try { - try + Console.Title = "minecraft_launcher_server"; + Console.InputEncoding = Encoding.Unicode; + Console.OutputEncoding = Encoding.Unicode; + PublicLog.LogEvent += Info.Log; + config = new DtsodV23(File.ReadAllText("launcher-server.dtsod")); + if (args.Contains("debug")) debug = true; + Info.Log("b", "local address: <", "c", config["local_ip"], "b", + ">\npublic address: <", "c", OldNetwork.GetPublicIP(), "b", + ">\nport: <", "c", config["local_port"].ToString(), "b", ">"); + mainSocket.Bind(new IPEndPoint(IPAddress.Parse(config["local_ip"]), config["local_port"])); + mainSocket.Listen(1000); + CreateManifestы(); + Info.Log("g", "server started succesfully"); + // запуск отдельного потока для каждого юзера + Info.Log("b", "waiting for users"); + while (true) { - Console.Title = "minecraft_launcher_server"; - Console.InputEncoding = Encoding.Unicode; - Console.OutputEncoding = Encoding.Unicode; - PublicLog.LogEvent += Info.Log; - config = new DtsodV23(File.ReadAllText("launcher-server.dtsod")); - if (args.Contains("debug")) debug = true; - Info.Log("b", "local address: <", "c", config["local_ip"], "b", - ">\npublic address: <", "c", OldNetwork.GetPublicIP(), "b", - ">\nport: <", "c", config["local_port"].ToString(), "b", ">"); - mainSocket.Bind(new IPEndPoint(IPAddress.Parse(config["local_ip"]), config["local_port"])); - mainSocket.Listen(1000); - CreateManifestы(); - Info.Log("g", "server started succesfully"); - // запуск отдельного потока для каждого юзера - Info.Log("b", "waiting for users"); + var userSocket = mainSocket.Accept(); + var userThread = new Thread(obj => UserHandle((Socket)obj)); + userThread.Start(userSocket); + } + } + catch (Exception ex) + { + Error.Log("r", $"{ex.Message}\n{ex.StackTrace}"); + mainSocket.Close(); + } + Info.Log("gray", ""); + } + + // запускается для каждого юзера в отдельном потоке + static void UserHandle(Socket handlerSocket) + { + Info.Log("b", "user connecting... "); + try + { + // тут запрос пароля заменён запросом заглушки + handlerSocket.SendPackage("requesting hash".ToBytes()); + var hasher = new Hasher(); + var hash = hasher.HashCycled(handlerSocket.GetPackage(), 64); + FSP fsp = new(handlerSocket); + FSP.debug = debug; + // запрос от апдейтера + if (hash.HashToString() == "39368b9c9ca9a74007acd2358fb7945cf172fc86c93969d0933e40aee6c10ca8") + { + Info.Log("b", "user is ", "c", "updater"); + handlerSocket.SendPackage("updater".ToBytes()); + // обработка запросов while (true) { - var userSocket = mainSocket.Accept(); - var userThread = new Thread(obj => UserHandle((Socket)obj)); - userThread.Start(userSocket); - } - } - catch (Exception ex) - { - Error.Log("r", $"{ex.Message}\n{ex.StackTrace}"); - mainSocket.Close(); - } - Info.Log("gray", ""); - } - - // запускается для каждого юзера в отдельном потоке - static void UserHandle(Socket handlerSocket) - { - Info.Log("b", "user connecting... "); - try - { - // тут запрос пароля заменён запросом заглушки - handlerSocket.SendPackage("requesting hash".ToBytes()); - var hasher = new Hasher(); - var hash = hasher.HashCycled(handlerSocket.GetPackage(), 64); - FSP fsp = new(handlerSocket); - FSP.debug = debug; - // запрос от апдейтера - if (hash.HashToString() == "39368b9c9ca9a74007acd2358fb7945cf172fc86c93969d0933e40aee6c10ca8") - { - Info.Log("b", "user is ", "c", "updater"); - handlerSocket.SendPackage("updater".ToBytes()); - // обработка запросов - while (true) + if (handlerSocket.Available >= 2) { - if (handlerSocket.Available >= 2) + string request = handlerSocket.GetPackage().BytesToString(); + switch (request) { - string request = handlerSocket.GetPackage().BytesToString(); - switch (request) - { - case "requesting launcher update": - Info.Log("b", "updater requested launcher update"); - fsp.UploadFile("share\\minecraft-launcher.exe"); - break; - case "register new user": - Info.Log("b", "new user registration requested"); - handlerSocket.SendPackage("ready".ToBytes()); - var req = StringConverter.MergeToString( - hasher.HashCycled(handlerSocket.GetPackage(), 64).HashToString(), - ":\n{\n\tusername: \"", handlerSocket.GetPackage().BytesToString(), - "\";\n\tuuid: \"null\";\n};"); - var filepath = $"registration_requests\\{DateTime.Now.ToString(MyTimeFormat.ForFileNames)}.req"; - File.WriteAllText(filepath, req); - Info.Log("b", "text wrote to file <", "c", $"registration_requests\\{filepath}", "b", ">"); - break; - default: - throw new Exception("unknown request: " + request); - } + case "requesting launcher update": + Info.Log("b", "updater requested launcher update"); + fsp.UploadFile("share\\minecraft-launcher.exe"); + break; + case "register new user": + Info.Log("b", "new user registration requested"); + handlerSocket.SendPackage("ready".ToBytes()); + var req = StringConverter.MergeToString( + hasher.HashCycled(handlerSocket.GetPackage(), 64).HashToString(), + ":\n{\n\tusername: \"", handlerSocket.GetPackage().BytesToString(), + "\";\n\tuuid: \"null\";\n};"); + var filepath = $"registration_requests\\{DateTime.Now.ToString(MyTimeFormat.ForFileNames)}.req"; + File.WriteAllText(filepath, req); + Info.Log("b", "text wrote to file <", "c", $"registration_requests\\{filepath}", "b", ">"); + break; + default: + throw new Exception("unknown request: " + request); } - else Thread.Sleep(10); } + else Thread.Sleep(10); } - // запрос от юзера + } + // запрос от юзера - if (FindUser(hash, out var user)) + if (FindUser(hash, out var user)) + { + Info.Log("b", "user is ", "c", user.name); + handlerSocket.SendPackage("launcher".ToBytes()); + // обработка запросов + while (true) { - Info.Log("b", "user is ", "c", user.name); - handlerSocket.SendPackage("launcher".ToBytes()); - // обработка запросов - while (true) + if (handlerSocket.Available >= 2) { - if (handlerSocket.Available >= 2) + var request = handlerSocket.GetPackage().BytesToString(); + switch (request) { - var request = handlerSocket.GetPackage().BytesToString(); - switch (request) - { - case "requesting file download": - var file = handlerSocket.GetPackage().BytesToString(); - Info.Log("b", "user ", "c", user.name, "b", " requested file ", "c", file + ""); - if (file == "manifest.dtsod") - { - lock (manifestLocker) fsp.UploadFile("share\\manifest.dtsod"); - } - else fsp.UploadFile("share\\" + file); - break; - case "requesting uuid": - Info.Log("b", "user ", "c", user.name, "b", " requested uuid"); - handlerSocket.SendPackage(user.uuid.ToBytes()); - break; - case "excess files found": - Info.Log("b", "user ", "c", user.name, "b", " sent excess files list"); - fsp.DownloadFile($"excesses\\{user.name}-{DateTime.Now.ToString(MyTimeFormat.ForFileNames)}.txt"); - break; - case "sending launcher error": - Info.Log("y", "user ", "c", user.name, "y", "is sending error:"); - string error = handlerSocket.GetPackage().BytesToString(); - Info.Log("y", error + '\n'); - break; - default: - throw new Exception("unknown request: " + request); - } + case "requesting file download": + var file = handlerSocket.GetPackage().BytesToString(); + Info.Log("b", "user ", "c", user.name, "b", " requested file ", "c", file + ""); + if (file == "manifest.dtsod") + { + lock (manifestLocker) fsp.UploadFile("share\\manifest.dtsod"); + } + else fsp.UploadFile("share\\" + file); + break; + case "requesting uuid": + Info.Log("b", "user ", "c", user.name, "b", " requested uuid"); + handlerSocket.SendPackage(user.uuid.ToBytes()); + break; + case "excess files found": + Info.Log("b", "user ", "c", user.name, "b", " sent excess files list"); + fsp.DownloadFile($"excesses\\{user.name}-{DateTime.Now.ToString(MyTimeFormat.ForFileNames)}.txt"); + break; + case "sending launcher error": + Info.Log("y", "user ", "c", user.name, "y", "is sending error:"); + string error = handlerSocket.GetPackage().BytesToString(); + Info.Log("y", error + '\n'); + break; + default: + throw new Exception("unknown request: " + request); } - else Thread.Sleep(10); } + else Thread.Sleep(10); } - // неизвестный юзер + } + // неизвестный юзер - Error.Log("y", $"user with hash <{hash.HashToString()}> not found"); - handlerSocket.SendPackage("user not found".ToBytes()); - } - catch (Exception ex) - { - Error.Log("y", $"{ex.Message}\n{ex.StackTrace}"); - } - finally - { - if (handlerSocket.Connected) handlerSocket.Shutdown(SocketShutdown.Both); - handlerSocket.Close(); - Info.Log("g", "user disconnected"); - } + Error.Log("y", $"user with hash <{hash.HashToString()}> not found"); + handlerSocket.SendPackage("user not found".ToBytes()); } - - static void CreateManifestы() + catch (Exception ex) { - lock (manifestLocker) - { - FSP.CreateManifest("share\\download_if_not_exist"); - FSP.CreateManifest("share\\sync_always"); - if(!Directory.Exists("share\\sync_and_remove")) - { - Directory.Create("share\\sync_and_remove"); - Info.Log("y", "can't create manifest, dir doesn't exist"); - } - else foreach (string dir in Directory.GetDirectories("share\\sync_and_remove")) - FSP.CreateManifest(dir); - File.WriteAllText("share\\sync_and_remove\\dirlist.dtsod", - "dirs: [\"" - +Directory.GetDirectories("share\\sync_and_remove") - .MergeToString("\", \"").Replace("share\\sync_and_remove\\", "") - +"\"];"); - } + Error.Log("y", $"{ex.Message}\n{ex.StackTrace}"); } - - static bool FindUser(byte[] hash, out (string name, string uuid) user) + finally { - DtsodV23 usersdb = new(File.ReadAllText("users.dtsod")); - user = new(); - if (usersdb.ContainsKey(hash.HashToString())) - { - user.name = usersdb[hash.HashToString()]["username"]; - user.uuid = usersdb[hash.HashToString()]["uuid"]; - return true; - } - - return false; + if (handlerSocket.Connected) handlerSocket.Shutdown(SocketShutdown.Both); + handlerSocket.Close(); + Info.Log("g", "user disconnected"); } } -} + + static void CreateManifestы() + { + lock (manifestLocker) + { + FSP.CreateManifest("share\\download_if_not_exist"); + FSP.CreateManifest("share\\sync_always"); + if(!Directory.Exists("share\\sync_and_remove")) + { + Directory.Create("share\\sync_and_remove"); + Info.Log("y", "can't create manifest, dir doesn't exist"); + } + else foreach (string dir in Directory.GetDirectories("share\\sync_and_remove")) + FSP.CreateManifest(dir); + if(Directory.GetDirectories("share\\sync_and_remove").Length==0) + File.WriteAllText("share\\sync_and_remove\\dirlist.dtsod", "dirs: [ ];"); + else File.WriteAllText("share\\sync_and_remove\\dirlist.dtsod", + "dirs: [\"" + +Directory.GetDirectories("share\\sync_and_remove") + .MergeToString("\", \"").Replace("share\\sync_and_remove\\", "") + +"\"];"); + } + } + + static bool FindUser(byte[] hash, out (string name, string uuid) user) + { + DtsodV23 usersdb = new(File.ReadAllText("users.dtsod")); + user = new(); + if (usersdb.ContainsKey(hash.HashToString())) + { + user.name = usersdb[hash.HashToString()]["username"]; + user.uuid = usersdb[hash.HashToString()]["uuid"]; + return true; + } + + return false; + } + + static string GetUUID(string username) + { + var response=new HttpClient().GetAsync( + $"https://api.mojang.com/users/profiles/minecraft/{username}") + .GetAwaiter().GetResult(); + var content = response.Content.ReadAsStringAsync().GetAwaiter().GetResult(); + JObject json = (JObject)JsonConvert.DeserializeObject(content) + ?? throw new Exception("cant parse to json:\n"+content); + var uuid = json["id"] ?? throw new Exception("cant het id from json:\n"+content); + return uuid.Value(); + } +} \ No newline at end of file diff --git a/minecraft-launcher-server/launcher-server.csproj b/minecraft-launcher-server/launcher-server.csproj index 8e074d6..ba27fa8 100644 --- a/minecraft-launcher-server/launcher-server.csproj +++ b/minecraft-launcher-server/launcher-server.csproj @@ -17,4 +17,7 @@ Always + + + \ No newline at end of file