diff --git a/minecraft-launcher-client/Launcher.LaunchGame.cs b/minecraft-launcher-client/Launcher.LaunchGame.cs new file mode 100644 index 0000000..4e2bae1 --- /dev/null +++ b/minecraft-launcher-client/Launcher.LaunchGame.cs @@ -0,0 +1,188 @@ +using System.Diagnostics; + +namespace launcher_client; + +internal static partial class Launcher +{ + private static void LaunchGame_1_12(string javapath, string username, string uuid, + int maxmemory, int width, int height) => + gameProcess = Process.Start($"{javapath}\\javaw.exe ", + "-Djava.net.preferIPv4Stack=true \"-Dos.name=Windows 10\" -Dos.version=10.0 " + + $"-Xmn256M -Xmx{maxmemory}M -Djava.library.path=version\\natives -cp " + + "libraries\\net\\minecraftforge\\forge\\1.12.2-14.23.5.2855\\forge-1.12.2-14.23.5.2855.jar;" + + "libraries\\org\\ow2\\asm\\asm-debug-all\\5.2\\asm-debug-all-5.2.jar;" + + "libraries\\net\\minecraft\\launchwrapper\\1.12\\launchwrapper-1.12.jar;" + + "libraries\\org\\jline\\jline\\3.5.1\\jline-3.5.1.jar;" + + "libraries\\com\\typesafe\\akka\\akka-actor_2.11\\2.3.3\\akka-actor_2.11-2.3.3.jar;" + + "libraries\\com\\typesafe\\config\\1.2.1\\config-1.2.1.jar;" + + "libraries\\org\\scala-lang\\scala-actors-migration_2.11\\1.1.0\\scala-actors-migration_2.11-1.1.0.jar;" + + "libraries\\org\\scala-lang\\scala-compiler\\2.11.1\\scala-compiler-2.11.1.jar;" + + "libraries\\org\\scala-lang\\plugins\\scala-continuations-library_2.11\\1.0.2_mc\\scala-continuations-library_2.11-1.0.2_mc.jar;l" + + "ibraries\\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;" + + "libraries\\org\\scala-lang\\scala-library\\2.11.1\\scala-library-2.11.1.jar;" + + "libraries\\org\\scala-lang\\scala-parser-combinators_2.11\\1.0.1\\scala-parser-combinators_2.11-1.0.1.jar;" + + "libraries\\org\\scala-lang\\scala-reflect\\2.11.1\\scala-reflect-2.11.1.jar;" + + "libraries\\org\\scala-lang\\scala-swing_2.11\\1.0.1\\scala-swing_2.11-1.0.1.jar;" + + "libraries\\org\\scala-lang\\scala-xml_2.11\\1.0.2\\scala-xml_2.11-1.0.2.jar;" + + "libraries\\lzma\\lzma\\0.0.1\\lzma-0.0.1.jar;" + + "libraries\\java3d\\vecmath\\1.5.2\\vecmath-1.5.2.jar;" + + "libraries\\net\\sf\\trove4j\\trove4j\\3.0.3\\trove4j-3.0.3.jar;" + + "libraries\\org\\apache\\maven\\maven-artifact\\3.5.3\\maven-artifact-3.5.3.jar;" + + "libraries\\net\\sf\\jopt-simple\\jopt-simple\\5.0.3\\jopt-simple-5.0.3.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\\platform-3.4.0.jar;" + + "libraries\\com\\ibm\\icu\\icu4j-core-mojang\\51.2\\icu4j-core-mojang-51.2.jar;" + + "libraries\\net\\sf\\jopt-simple\\jopt-simple\\5.0.3\\jopt-simple-5.0.3.jar;" + + "libraries\\com\\paulscode\\codecjorbis\\20101023\\codecjorbis-20101023.jar;" + + "libraries\\com\\paulscode\\codecwav\\20101023\\codecwav-20101023.jar;" + + "libraries\\com\\paulscode\\libraryjavasound\\20101123\\libraryjavasound-20101123.jar;" + + "libraries\\com\\paulscode\\librarylwjglopenal\\20100824\\librarylwjglopenal-20100824.jar;" + + "libraries\\com\\paulscode\\soundsystem\\20120107\\soundsystem-20120107.jar;" + + "libraries\\io\\netty\\netty-all\\4.1.9.Final\\netty-all-4.1.9.Final.jar;" + + "libraries\\com\\google\\guava\\guava\\21.0\\guava-21.0.jar;" + + "libraries\\org\\apache\\commons\\commons-lang3\\3.5\\commons-lang3-3.5.jar;" + + "libraries\\commons-io\\commons-io\\2.5\\commons-io-2.5.jar;" + + "libraries\\commons-codec\\commons-codec\\1.10\\commons-codec-1.10.jar;" + + "libraries\\net\\java\\jinput\\jinput\\2.0.5\\jinput-2.0.5.jar;" + + "libraries\\net\\java\\jutils\\jutils\\1.0.0\\jutils-1.0.0.jar;" + + "libraries\\com\\google\\code\\gson\\gson\\2.8.0\\gson-2.8.0.jar;" + + "libraries\\com\\mojang\\authlib\\1.5.25\\authlib-1.5.25.jar;" + + "libraries\\com\\mojang\\realms\\1.10.22\\realms-1.10.22.jar;" + + "libraries\\org\\apache\\commons\\commons-compress\\1.8.1\\commons-compress-1.8.1.jar;" + + "libraries\\org\\apache\\httpcomponents\\httpclient\\4.3.3\\httpclient-4.3.3.jar;" + + "libraries\\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;" + + "version\\1.12.2-forge-14.23.5.2855.jar " + + "-Dminecraft.applet.TargetDirectory=.\\ " + + "-Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true " + + "--gameDir .\\ --assetsDir assets --assetIndex 1.12 " + + $"net.minecraft.launchwrapper.Launch --username {username} --version 1.12.2-forge-14.23.5.2855 " + + $"--uuid {uuid} --accessToken null --userType mojang --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker " + + $"--versionType Forge --width {width} --height {height}"); + + 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" + + "-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 " + + "-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump " + + "-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 " + + "-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/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 " + + "--add-exports java.base/sun.security.util=cpw.mods.securejarhandler " + + "--add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming cpw.mods.bootstraplauncher.BootstrapLauncher " + + "--version 1.19.2-forge-43.1.30 " + + "--gameDir .\\ --assetsDir .\\assets --assetIndex 1.19 " + + "--accessToken null --clientId \"\" --xuid \"\" --userType legacy " + + "--versionType release " + + "--launchTarget forgeclient --fml.forgeVersion 43.1.30 " + + "--fml.mcVersion 1.19.2 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20220805.130853 " + + $"--username {username} " + + $"--uuid {uuid} " + + $"--width {width} --height {height}"); +} \ No newline at end of file diff --git a/minecraft-launcher-client/Launcher.cs b/minecraft-launcher-client/Launcher.cs index 23176d9..059bec6 100644 --- a/minecraft-launcher-client/Launcher.cs +++ b/minecraft-launcher-client/Launcher.cs @@ -1,7 +1,6 @@ using System; using System.Diagnostics; using System.Dynamic; -using System.IO; using System.Linq; using System.Net; using System.Net.Sockets; @@ -18,11 +17,11 @@ using File = DTLib.Filesystem.File; namespace launcher_client; -internal static class Launcher +internal static partial class Launcher { private static ConsoleLogger Info = new("launcher-logs", "launcher-info"); private static ConsoleLogger Error = Info; //new("launcher-logs","launcher-error"); - private static Socket mainSocket = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + private static Socket mainSocket; public static bool debug, offline, updated; private static FSP FSP; private static dynamic tabs = new ExpandoObject(); @@ -34,212 +33,206 @@ internal static class Launcher { try { + Console.Title = "Timerix's minecraft launcher"; + Console.OutputEncoding = Encoding.UTF8; + Console.InputEncoding = Encoding.UTF8; + Console.CursorVisible = false; + Info.Log("g", "launcher is starting"); PublicLog.LogEvent += Info.Log; if (args.Contains("debug")) debug = true; if (args.Contains("offline")) offline = true; if (args.Contains("updated")) updated = true; + config = !File.Exists(configFileName) + ? LauncherConfig.CreateDefault(configFileName) + : new LauncherConfig(configFileName); // обновление лаунчера if (!updated && !offline) { Connect("updater".ToBytes(), "updater"); mainSocket.SendPackage("requesting launcher update".ToBytes()); - FSP.DownloadFile("launcher.exe_new"); - Info.Log("g", "launcher.exe_new downloaded"); - Process.Start("cmd", - "/c timeout 0 && copy launcher.exe_new launcher.exe && start launcher.exe updated && del /f launcher.exe_new"); + FSP.DownloadFile("minecraft-launcher.exe_new"); + Info.Log("g", "minecraft-launcher.exe_new downloaded"); + if(File.Exists("minecraft-launcher.exe_old")) + File.Delete("minecraft-launcher.exe_old"); + System.IO.File.Move("minecraft-launcher.exe", "minecraft-launcher.exe_old"); + Process.Start("cmd","/c move minecraft-launcher.exe_new minecraft-launcher.exe && minecraft-launcher.exe updated"); + return; } // если уже обновлён - else if (updated || offline) + var launcherAssembly = Assembly.GetExecutingAssembly(); + + // читает текст из файлов, добавленных в сборку в виде ресурсов + string ReadResource(string resource_path) { - var launcherAssembly = Assembly.GetExecutingAssembly(); - - // читает текст из файлов, добавленных в сборку в виде ресурсов - string ReadResource(string resource_path) - { - using var resStream = launcherAssembly.GetManifestResourceStream(resource_path) - ?? throw new Exception($"can't find resource <{resource_path}>"); - using var resourceStreamReader = - new StreamReader(resStream, Encoding.UTF8); - return resourceStreamReader.ReadToEnd(); - } - - config = !File.Exists(configFileName) - ? LauncherConfig.CreateDefault(configFileName) - : new LauncherConfig(configFileName); - tabs.Login = ReadResource("launcher_client.gui.login.gui"); - tabs.Settings = ReadResource("launcher_client.gui.settings.gui"); - tabs.Exit = ReadResource("launcher_client.gui.exit.gui"); - tabs.Log = ""; - tabs.Current = ""; - Console.Title = "Timerix's minecraft launcher"; - Console.OutputEncoding = Encoding.UTF8; - Console.InputEncoding = Encoding.UTF8; - Console.CursorVisible = false; - Info.Log("g", "launcher is starting"); - var hasher = new Hasher(); - var password_hash = new byte[0]; - // username - var username = ""; - if (!config.Username.IsNullOrEmpty()) - { - tabs.Login = tabs.Login.Remove(833, config.Username.Length).Insert(833, config.Username); - username = config.Username; - } - - RenderTab(tabs.Login); - - while (true) - try - { - var pressedKey = Console.ReadKey(true); // Считывание ввода - switch (pressedKey.Key) - { - case ConsoleKey.F1: - RenderTab(tabs.Login); - break; - case ConsoleKey.N: - if (tabs.Current == tabs.Login) - { - tabs.Login = tabs.Login.Remove(751, 20).Insert(751, "┏━━━━━━━━━━━━━━━━━━┓") - .Remove(831, 20).Insert(831, "┃ ┃") - .Remove(911, 20).Insert(911, "┗━━━━━━━━━━━━━━━━━━┛"); - RenderTab(tabs.Login); - var _username = ReadString(33, 10, 15); - tabs.Login = tabs.Login.Remove(751, 20).Insert(751, "┌──────────────────┐") - .Remove(831, 20).Insert(831, "│ │") - .Remove(911, 20).Insert(911, "└──────────────────┘"); - RenderTab(tabs.Login); - if (_username.Length < 5) - throw new Exception("username length should be > 4 and < 17"); - config.Username = _username; - File.WriteAllText(configFileName, config.ToString()); - username = _username; - tabs.Login = tabs.Login.Remove(833, _username.Length).Insert(833, _username); - RenderTab(tabs.Login); - } - - break; - case ConsoleKey.P: - if (tabs.Current == tabs.Login) - { - tabs.Login = tabs.Login.Remove(991, 20).Insert(991, "┏━━━━━━━━━━━━━━━━━━┓") - .Remove(1071, 20).Insert(1071, "┃ ┃") - .Remove(1151, 20).Insert(1151, "┗━━━━━━━━━━━━━━━━━━┛"); - RenderTab(tabs.Login); - var password = ReadString(33, 13, 15); - tabs.Login = tabs.Login.Remove(991, 20).Insert(991, "┌──────────────────┐") - .Remove(1071, 20).Insert(1071, "│ │") - .Remove(1151, 20).Insert(1151, "└──────────────────┘"); - RenderTab(tabs.Login); - if (password.Length < 8) - throw new Exception("password length should be > 7 and < 17"); - password_hash = hasher.HashCycled(password.ToBytes(), 64); - tabs.Login = tabs.Login.Remove(1073, password.Length) - .Insert(1073, "*".Multiply(password.Length)); - RenderTab(tabs.Login); - } - - break; - case ConsoleKey.L: - if (tabs.Current == tabs.Login) - { - RenderTab(tabs.Current); - if (username.Length < 5) throw new Exception("username is too short"); - if (password_hash.Length == 0) throw new Exception("pasword is null"); - // обновление клиента - if (!offline) - { - Connect(hasher.HashCycled(username.ToBytes(), password_hash, 64), "launcher"); - //обновление файлов клиента - Info.Log("b", "updating client..."); - FSP.DownloadByManifest("download_if_not_exist", Directory.GetCurrent()); - FSP.DownloadByManifest("sync_always", Directory.GetCurrent(), true); - foreach (string dir in new DtsodV23(FSP - .DownloadFileToMemory("sync_and_remove\\dirlist.dtsod") - .ToString())["dirs"]) - FSP.DownloadByManifest("sync_and_remove\\" + dir, - Directory.GetCurrent() + '\\' + dir, true, true); - Info.Log("g", "client updated"); - } - - if (!config.UUID.IsNullOrEmpty()) - { - Info.Log("y", "uuid not found in config. requesting from server"); - mainSocket.SendPackage("requesting uuid".ToBytes()); - var uuid = mainSocket.GetPackage().ToString(); - config.UUID = uuid; - } - - File.WriteAllText(configFileName, config.ToString()); - // запуск майнкрафта - Info.Log("g", "launching minecraft"); - LaunchGame(config.JavaPath, config.Username, config.UUID, - config.GameMemory, config.GameWindowWidth, config.GameWindowHeight); - gameProcess.WaitForExit(); - Info.Log("b", "minecraft closed"); - } - - break; - case ConsoleKey.R: - if (tabs.Current == tabs.Login && !offline) - { - RenderTab(tabs.Current); - if (username.Length < 5) throw new Exception("username is too short"); - if (password_hash.Length == 0) throw new Exception("pasword is null"); - Connect("updater".ToBytes(), "updater"); - mainSocket.SendPackage("register new user".ToBytes()); - mainSocket.GetAnswer("ready"); - mainSocket.SendPackage(hasher.HashCycled(username.ToBytes(), password_hash, 64)); - mainSocket.SendPackage(username.ToBytes()); - Thread.Sleep(300); - Console.Write("."); - Thread.Sleep(300); - Console.Write("."); - Thread.Sleep(300); - Console.Write("."); - Thread.Sleep(300); - Console.Write("."); - Info.Log("g", "registration request sent"); - } - - break; - case ConsoleKey.F2: - tabs.Log = File.ReadAllText(Info.LogfileName); - RenderTab(tabs.Log, 9999); - break; - case ConsoleKey.F3: - RenderTab(tabs.Settings); - break; - case ConsoleKey.F4: - RenderTab(tabs.Exit); - break; - case ConsoleKey.Enter: - if (tabs.Current == tabs.Exit) - { - Console.Clear(); - Console.BufferHeight = 9999; - return; - } - - break; - case ConsoleKey.F5: - if (tabs.Current == tabs.Log) goto case ConsoleKey.F2; - RenderTab(tabs.Current); - Console.CursorVisible = false; - break; - } - } - catch (Exception ex) - { - Error.Log("r", $"{ex.Message}\n{ex.StackTrace}"); - } + using var resStream = launcherAssembly.GetManifestResourceStream(resource_path) + ?? throw new Exception($"can't find resource <{resource_path}>"); + using var resourceStreamReader = + new System.IO.StreamReader(resStream, Encoding.UTF8); + return resourceStreamReader.ReadToEnd(); } - else + tabs.Login = ReadResource("launcher_client.gui.login.gui"); + tabs.Settings = ReadResource("launcher_client.gui.settings.gui"); + tabs.Exit = ReadResource("launcher_client.gui.exit.gui"); + tabs.Log = ""; + tabs.Current = ""; + var hasher = new Hasher(); + var password_hash = new byte[0]; + // username + var username = ""; + if (!config.Username.IsNullOrEmpty()) { - throw new Exception($"invalid args:<{args.MergeToString(">, <")}>"); + tabs.Login = tabs.Login.Remove(833, config.Username.Length).Insert(833, config.Username); + username = config.Username; + } + + RenderTab(tabs.Login); + + while (true) try + // ReSharper disable once BadChildStatementIndent + { + var pressedKey = Console.ReadKey(true); // Считывание ввода + switch (pressedKey.Key) + { + case ConsoleKey.F1: + RenderTab(tabs.Login); + break; + case ConsoleKey.N: + if (tabs.Current == tabs.Login) + { + tabs.Login = tabs.Login + .Remove(751, 20).Insert(751, "┏━━━━━━━━━━━━━━━━━━┓") + .Remove(831, 20).Insert(831, "┃ ┃") + .Remove(911, 20).Insert(911, "┗━━━━━━━━━━━━━━━━━━┛"); + RenderTab(tabs.Login); + var _username = ReadString(33, 10, 15); + tabs.Login = tabs.Login + .Remove(751, 20).Insert(751, "┌──────────────────┐") + .Remove(831, 20).Insert(831, "│ │") + .Remove(911, 20).Insert(911, "└──────────────────┘"); + RenderTab(tabs.Login); + if (_username.Length < 5) + throw new Exception("username length should be > 4 and < 17"); + config.Username = _username; + config.Save(); + username = _username; + tabs.Login = tabs.Login.Remove(833, _username.Length).Insert(833, _username); + RenderTab(tabs.Login); + } + break; + case ConsoleKey.P: + if (tabs.Current == tabs.Login) + { + tabs.Login = tabs.Login + .Remove(991, 20).Insert(991, "┏━━━━━━━━━━━━━━━━━━┓") + .Remove(1071, 20).Insert(1071, "┃ ┃") + .Remove(1151, 20).Insert(1151, "┗━━━━━━━━━━━━━━━━━━┛"); + RenderTab(tabs.Login); + var password = ReadString(33, 13, 15); + tabs.Login = tabs.Login + .Remove(991, 20).Insert(991, "┌──────────────────┐") + .Remove(1071, 20).Insert(1071, "│ │") + .Remove(1151, 20).Insert(1151, "└──────────────────┘"); + RenderTab(tabs.Login); + if (password.Length < 8) + throw new Exception("password length should be > 7 and < 17"); + password_hash = hasher.HashCycled(password.ToBytes(), 64); + tabs.Login = tabs.Login.Remove(1073, password.Length) + .Insert(1073, "*".Multiply(password.Length)); + RenderTab(tabs.Login); + } + break; + case ConsoleKey.L: + if (tabs.Current == tabs.Login) + { + RenderTab(tabs.Current); + if (username.Length < 5) throw new Exception("username is too short"); + if (password_hash.Length == 0) throw new Exception("pasword is null"); + // обновление клиента + if (!offline) + { + Connect(hasher.HashCycled(username.ToBytes(), password_hash, 64), "launcher"); + //обновление файлов клиента + Info.Log("b", "updating client..."); + FSP.DownloadByManifest("download_if_not_exist", Directory.GetCurrent()); + FSP.DownloadByManifest("sync_always", Directory.GetCurrent(), true); + foreach (string dir in new DtsodV23(FSP + .DownloadFileToMemory("sync_and_remove\\dirlist.dtsod") + .BytesToString())["dirs"]) + FSP.DownloadByManifest("sync_and_remove\\" + dir, + Directory.GetCurrent() + '\\' + dir, true, true); + Info.Log("g", "client updated"); + } + + if (!config.UUID.IsNullOrEmpty()) + { + Info.Log("y", "uuid not found in config. requesting from server"); + mainSocket.SendPackage("requesting uuid".ToBytes()); + var uuid = mainSocket.GetPackage().BytesToString(); + config.UUID = uuid; + } + + config.Save(); + // запуск майнкрафта + Info.Log("g", "launching minecraft"); + LaunchGame(config.JavaPath, config.Username, config.UUID, + config.GameMemory, config.GameWindowWidth, config.GameWindowHeight); + gameProcess.WaitForExit(); + Info.Log("b", "minecraft closed"); + } + break; + case ConsoleKey.R: + if (tabs.Current == tabs.Login && !offline) + { + RenderTab(tabs.Current); + if (username.Length < 5) throw new Exception("username is too short"); + if (password_hash.Length == 0) throw new Exception("pasword is null"); + Connect("updater".ToBytes(), "updater"); + mainSocket.SendPackage("register new user".ToBytes()); + mainSocket.GetAnswer("ready"); + mainSocket.SendPackage(hasher.HashCycled(username.ToBytes(), password_hash, 64)); + mainSocket.SendPackage(username.ToBytes()); + Thread.Sleep(300); + Console.Write("."); + Thread.Sleep(300); + Console.Write("."); + Thread.Sleep(300); + Console.Write("."); + Thread.Sleep(300); + Console.Write("."); + Info.Log("g", "registration request sent"); + } + break; + case ConsoleKey.F2: + tabs.Log = File.ReadAllText(Info.LogfileName); + RenderTab(tabs.Log, 9999); + break; + case ConsoleKey.F3: + RenderTab(tabs.Settings); + break; + case ConsoleKey.F4: + RenderTab(tabs.Exit); + break; + case ConsoleKey.Enter: + if (tabs.Current == tabs.Exit) + { + Console.Clear(); + Console.BufferHeight = 9999; + return; + } + break; + case ConsoleKey.F5: + if (tabs.Current == tabs.Log) goto case ConsoleKey.F2; + RenderTab(tabs.Current); + Console.CursorVisible = false; + break; + } + } + catch (Exception ex) + { + Error.Log("r", $"{ex.Message}\n{ex.StackTrace}"); } } catch (Exception ex) @@ -253,7 +246,7 @@ internal static class Launcher // подключение серверу private static void Connect(byte[] hash, string server_answer) { - if (mainSocket.Connected) + if (mainSocket!=null && mainSocket.Connected) { Info.Log("y", "socket is connected already. disconnecting..."); mainSocket.Shutdown(SocketShutdown.Both); @@ -265,7 +258,7 @@ internal static class Launcher try { Info.Log("b", "connecting to server address: <", "c", config.ServerAddress, "b", - ">\nserver port: <", "c", config.ServerPort.ToString(), "b", ">"); + ">\nserver port: <", "c", $"{config.ServerPort}", "b", ">"); var ip = Dns.GetHostAddresses(config.ServerAddress)[0]; mainSocket.Connect(new IPEndPoint(ip, config.ServerPort)); Info.Log("g", $"connected to server {ip}"); @@ -273,7 +266,7 @@ internal static class Launcher } catch (SocketException ex) { - Error.Log("r", $"{ex.Message}\n{ex.StackTrace}"); + Error.Log("r", $"{ex.Message}\n{ex.StackTrace}"); Thread.Sleep(2000); } @@ -349,69 +342,4 @@ internal static class Launcher } } } - - private static void LaunchGame(string javapath, string username, string uuid, int maxmemory, int width, - int height) - { - gameProcess = Process.Start($"{javapath}\\javaw.exe ", - "-Djava.net.preferIPv4Stack=true \"-Dos.name=Windows 10\" -Dos.version=10.0 " + - $"-Xmn256M -Xmx{maxmemory}M -Djava.library.path=version\\natives -cp " + - "libraries\\net\\minecraftforge\\forge\\1.12.2-14.23.5.2855\\forge-1.12.2-14.23.5.2855.jar;" + - "libraries\\org\\ow2\\asm\\asm-debug-all\\5.2\\asm-debug-all-5.2.jar;" + - "libraries\\net\\minecraft\\launchwrapper\\1.12\\launchwrapper-1.12.jar;" + - "libraries\\org\\jline\\jline\\3.5.1\\jline-3.5.1.jar;" + - "libraries\\com\\typesafe\\akka\\akka-actor_2.11\\2.3.3\\akka-actor_2.11-2.3.3.jar;" + - "libraries\\com\\typesafe\\config\\1.2.1\\config-1.2.1.jar;" + - "libraries\\org\\scala-lang\\scala-actors-migration_2.11\\1.1.0\\scala-actors-migration_2.11-1.1.0.jar;" + - "libraries\\org\\scala-lang\\scala-compiler\\2.11.1\\scala-compiler-2.11.1.jar;" + - "libraries\\org\\scala-lang\\plugins\\scala-continuations-library_2.11\\1.0.2_mc\\scala-continuations-library_2.11-1.0.2_mc.jar;l" + - "ibraries\\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;" + - "libraries\\org\\scala-lang\\scala-library\\2.11.1\\scala-library-2.11.1.jar;" + - "libraries\\org\\scala-lang\\scala-parser-combinators_2.11\\1.0.1\\scala-parser-combinators_2.11-1.0.1.jar;" + - "libraries\\org\\scala-lang\\scala-reflect\\2.11.1\\scala-reflect-2.11.1.jar;" + - "libraries\\org\\scala-lang\\scala-swing_2.11\\1.0.1\\scala-swing_2.11-1.0.1.jar;" + - "libraries\\org\\scala-lang\\scala-xml_2.11\\1.0.2\\scala-xml_2.11-1.0.2.jar;" + - "libraries\\lzma\\lzma\\0.0.1\\lzma-0.0.1.jar;" + - "libraries\\java3d\\vecmath\\1.5.2\\vecmath-1.5.2.jar;" + - "libraries\\net\\sf\\trove4j\\trove4j\\3.0.3\\trove4j-3.0.3.jar;" + - "libraries\\org\\apache\\maven\\maven-artifact\\3.5.3\\maven-artifact-3.5.3.jar;" + - "libraries\\net\\sf\\jopt-simple\\jopt-simple\\5.0.3\\jopt-simple-5.0.3.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\\platform-3.4.0.jar;" + - "libraries\\com\\ibm\\icu\\icu4j-core-mojang\\51.2\\icu4j-core-mojang-51.2.jar;" + - "libraries\\net\\sf\\jopt-simple\\jopt-simple\\5.0.3\\jopt-simple-5.0.3.jar;" + - "libraries\\com\\paulscode\\codecjorbis\\20101023\\codecjorbis-20101023.jar;" + - "libraries\\com\\paulscode\\codecwav\\20101023\\codecwav-20101023.jar;" + - "libraries\\com\\paulscode\\libraryjavasound\\20101123\\libraryjavasound-20101123.jar;" + - "libraries\\com\\paulscode\\librarylwjglopenal\\20100824\\librarylwjglopenal-20100824.jar;" + - "libraries\\com\\paulscode\\soundsystem\\20120107\\soundsystem-20120107.jar;" + - "libraries\\io\\netty\\netty-all\\4.1.9.Final\\netty-all-4.1.9.Final.jar;" + - "libraries\\com\\google\\guava\\guava\\21.0\\guava-21.0.jar;" + - "libraries\\org\\apache\\commons\\commons-lang3\\3.5\\commons-lang3-3.5.jar;" + - "libraries\\commons-io\\commons-io\\2.5\\commons-io-2.5.jar;" + - "libraries\\commons-codec\\commons-codec\\1.10\\commons-codec-1.10.jar;" + - "libraries\\net\\java\\jinput\\jinput\\2.0.5\\jinput-2.0.5.jar;" + - "libraries\\net\\java\\jutils\\jutils\\1.0.0\\jutils-1.0.0.jar;" + - "libraries\\com\\google\\code\\gson\\gson\\2.8.0\\gson-2.8.0.jar;" + - "libraries\\com\\mojang\\authlib\\1.5.25\\authlib-1.5.25.jar;" + - "libraries\\com\\mojang\\realms\\1.10.22\\realms-1.10.22.jar;" + - "libraries\\org\\apache\\commons\\commons-compress\\1.8.1\\commons-compress-1.8.1.jar;" + - "libraries\\org\\apache\\httpcomponents\\httpclient\\4.3.3\\httpclient-4.3.3.jar;" + - "libraries\\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;" + - "version\\1.12.2-forge-14.23.5.2855.jar " + - $"-Dminecraft.applet.TargetDirectory=.\\ " + - "-Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true " + - $"net.minecraft.launchwrapper.Launch --username {username} --version 1.12.2-forge-14.23.5.2855 " + - $"--gameDir .\\ --assetsDir assets --assetIndex 1.12 " + - $"--uuid {uuid} --accessToken null --userType mojang --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker " + - $"--versionType Forge --width {width} --height {height}"); - } } \ No newline at end of file diff --git a/minecraft-launcher-client/launcher-client.csproj b/minecraft-launcher-client/launcher-client.csproj index 2e3709b..5f72cb3 100644 --- a/minecraft-launcher-client/launcher-client.csproj +++ b/minecraft-launcher-client/launcher-client.csproj @@ -5,11 +5,15 @@ disable Exe launcher_client - minecraft-launcher-client + minecraft-launcher + + + + \ No newline at end of file diff --git a/minecraft-launcher-server/Server.cs b/minecraft-launcher-server/Server.cs index dc214d8..b3710ae 100644 --- a/minecraft-launcher-server/Server.cs +++ b/minecraft-launcher-server/Server.cs @@ -79,19 +79,19 @@ namespace launcher_server { if (handlerSocket.Available >= 2) { - var request = handlerSocket.GetPackage().ToString(); + string request = handlerSocket.GetPackage().BytesToString(); switch (request) { case "requesting launcher update": - Info.Log("b", "updater requested client.exe"); - fsp.UploadFile("share\\launcher.exe"); + 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().ToString(), + ":\n{\n\tusername: \"", handlerSocket.GetPackage().BytesToString(), "\";\n\tuuid: \"null\";\n};"); var filepath = $"registration_requests\\{DateTime.Now.ToString(MyTimeFormat.ForFileNames)}.req"; File.WriteAllText(filepath, req); @@ -115,11 +115,11 @@ namespace launcher_server { if (handlerSocket.Available >= 2) { - var request = handlerSocket.GetPackage().ToString(); + var request = handlerSocket.GetPackage().BytesToString(); switch (request) { case "requesting file download": - var file = handlerSocket.GetPackage().ToString(); + var file = handlerSocket.GetPackage().BytesToString(); Info.Log("b", "user ", "c", user.name, "b", " requested file ", "c", file + ""); if (file == "manifest.dtsod") { @@ -137,7 +137,7 @@ namespace launcher_server break; case "sending launcher error": Info.Log("y", "user ", "c", user.name, "y", "is sending error:"); - string error = handlerSocket.GetPackage().ToString(); + string error = handlerSocket.GetPackage().BytesToString(); Info.Log("y", error + '\n'); break; default: @@ -170,7 +170,12 @@ namespace launcher_server { FSP.CreateManifest("share\\download_if_not_exist"); FSP.CreateManifest("share\\sync_always"); - foreach (string dir in Directory.GetDirectories("share\\sync_and_remove")) + 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: [\"" diff --git a/minecraft-launcher-server/launcher-server.csproj b/minecraft-launcher-server/launcher-server.csproj index 6a52580..8e074d6 100644 --- a/minecraft-launcher-server/launcher-server.csproj +++ b/minecraft-launcher-server/launcher-server.csproj @@ -12,4 +12,9 @@ + + + Always + + \ No newline at end of file diff --git a/minecraft-launcher-server/launcher-server.dtsod b/minecraft-launcher-server/launcher-server.dtsod index 61ed54f..42b937d 100644 --- a/minecraft-launcher-server/launcher-server.dtsod +++ b/minecraft-launcher-server/launcher-server.dtsod @@ -1,2 +1,2 @@ -local_ip: ""; +local_ip: "127.0.0.1"; local_port: 25000; \ No newline at end of file diff --git a/minecraft-launcher.sln b/minecraft-launcher.sln index 13f9ee1..b7e0b1f 100644 --- a/minecraft-launcher.sln +++ b/minecraft-launcher.sln @@ -15,52 +15,30 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib.Network", "..\..\DTLi EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Build|Any CPU = Build|Any CPU Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - Release-net48|Any CPU = Release-net48|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {49ADEFCE-DA46-4229-997C-3D43DD600627}.Build|Any CPU.ActiveCfg = Build|Any CPU - {49ADEFCE-DA46-4229-997C-3D43DD600627}.Build|Any CPU.Build.0 = Build|Any CPU - {49ADEFCE-DA46-4229-997C-3D43DD600627}.Debug|Any CPU.ActiveCfg = Build|Any CPU - {49ADEFCE-DA46-4229-997C-3D43DD600627}.Debug|Any CPU.Build.0 = Build|Any CPU - {49ADEFCE-DA46-4229-997C-3D43DD600627}.Release|Any CPU.ActiveCfg = Build|Any CPU - {49ADEFCE-DA46-4229-997C-3D43DD600627}.Release|Any CPU.Build.0 = Build|Any CPU - {49ADEFCE-DA46-4229-997C-3D43DD600627}.Release-net48|Any CPU.ActiveCfg = Build|Any CPU - {49ADEFCE-DA46-4229-997C-3D43DD600627}.Release-net48|Any CPU.Build.0 = Build|Any CPU - {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Build|Any CPU.ActiveCfg = Build|Any CPU - {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Build|Any CPU.Build.0 = Build|Any CPU - {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Debug|Any CPU.ActiveCfg = Build|Any CPU - {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Debug|Any CPU.Build.0 = Build|Any CPU - {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Release|Any CPU.ActiveCfg = Build|Any CPU - {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Release|Any CPU.Build.0 = Build|Any CPU - {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Release-net48|Any CPU.ActiveCfg = Build|Any CPU - {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Release-net48|Any CPU.Build.0 = Build|Any CPU - {57CDC0EF-31C9-4859-90E5-AD0B302C5EAE}.Build|Any CPU.ActiveCfg = Debug|Any CPU - {57CDC0EF-31C9-4859-90E5-AD0B302C5EAE}.Build|Any CPU.Build.0 = Debug|Any CPU {57CDC0EF-31C9-4859-90E5-AD0B302C5EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {57CDC0EF-31C9-4859-90E5-AD0B302C5EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU {57CDC0EF-31C9-4859-90E5-AD0B302C5EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU {57CDC0EF-31C9-4859-90E5-AD0B302C5EAE}.Release|Any CPU.Build.0 = Release|Any CPU - {57CDC0EF-31C9-4859-90E5-AD0B302C5EAE}.Release-net48|Any CPU.ActiveCfg = Release-net48|Any CPU - {57CDC0EF-31C9-4859-90E5-AD0B302C5EAE}.Release-net48|Any CPU.Build.0 = Release-net48|Any CPU - {1F6C1C6E-59A4-4C49-90ED-6D8A9F55F349}.Build|Any CPU.ActiveCfg = Debug|Any CPU - {1F6C1C6E-59A4-4C49-90ED-6D8A9F55F349}.Build|Any CPU.Build.0 = Debug|Any CPU {1F6C1C6E-59A4-4C49-90ED-6D8A9F55F349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F6C1C6E-59A4-4C49-90ED-6D8A9F55F349}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F6C1C6E-59A4-4C49-90ED-6D8A9F55F349}.Release|Any CPU.ActiveCfg = Release|Any CPU {1F6C1C6E-59A4-4C49-90ED-6D8A9F55F349}.Release|Any CPU.Build.0 = Release|Any CPU - {1F6C1C6E-59A4-4C49-90ED-6D8A9F55F349}.Release-net48|Any CPU.ActiveCfg = Debug|Any CPU - {1F6C1C6E-59A4-4C49-90ED-6D8A9F55F349}.Release-net48|Any CPU.Build.0 = Debug|Any CPU - {876103FA-6B0D-4322-B66D-0DFEEEFABD82}.Build|Any CPU.ActiveCfg = Debug|Any CPU - {876103FA-6B0D-4322-B66D-0DFEEEFABD82}.Build|Any CPU.Build.0 = Debug|Any CPU {876103FA-6B0D-4322-B66D-0DFEEEFABD82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {876103FA-6B0D-4322-B66D-0DFEEEFABD82}.Debug|Any CPU.Build.0 = Debug|Any CPU {876103FA-6B0D-4322-B66D-0DFEEEFABD82}.Release|Any CPU.ActiveCfg = Release|Any CPU {876103FA-6B0D-4322-B66D-0DFEEEFABD82}.Release|Any CPU.Build.0 = Release|Any CPU - {876103FA-6B0D-4322-B66D-0DFEEEFABD82}.Release-net48|Any CPU.ActiveCfg = Release-net48|Any CPU - {876103FA-6B0D-4322-B66D-0DFEEEFABD82}.Release-net48|Any CPU.Build.0 = Release-net48|Any CPU + {49ADEFCE-DA46-4229-997C-3D43DD600627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49ADEFCE-DA46-4229-997C-3D43DD600627}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49ADEFCE-DA46-4229-997C-3D43DD600627}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49ADEFCE-DA46-4229-997C-3D43DD600627}.Release|Any CPU.Build.0 = Release|Any CPU + {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1DC6892C-5DC8-4C1C-94C1-CE695BD2DBC2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE