修复多个Bug，更新版本号

Blessing-Studio · Jan 28, 2024 · 799c915 · 799c915
1 parent a5e5016
commit 799c915
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 75 deletions.
diff --git a/MinecraftLaunch.Test/Program.cs b/MinecraftLaunch.Test/Program.cs
@@ -1,14 +1,10 @@
-using System.IO.Compression;
-using MinecraftLaunch.Extensions;
-using MinecraftLaunch.Components.Launcher;
+using MinecraftLaunch.Components.Launcher;
 using MinecraftLaunch.Components.Resolver;
 using MinecraftLaunch.Classes.Models.Launch;
-using MinecraftLaunch.Components.Downloader;
-using MinecraftLaunch.Classes.Models.Download;
 using MinecraftLaunch.Components.Authenticator;
 
 var account = new OfflineAuthenticator("Yang114").Authenticate();
-var resolver = new GameResolver(".minecraft");
+var resolver = new GameResolver("C:\\Users\\w\\Desktop\\总整包\\MC\\mc启动器\\LauncherX\\.minecraft");
 
 var config = new LaunchConfig {
     Account = account,
@@ -29,4 +25,6 @@
 //检测游戏退出
 gameProcessWatcher.Exited += (sender, args) => {
     Console.WriteLine("exit");  
-};
+};
+
+Console.ReadKey();
diff --git a/MinecraftLaunch/Classes/Enums/Platform.cs b/MinecraftLaunch/Classes/Enums/Platform.cs
diff --git a/MinecraftLaunch/Classes/Interfaces/IGameProcessWatcher.cs b/MinecraftLaunch/Classes/Interfaces/IGameProcessWatcher.cs
@@ -3,7 +3,7 @@
 
 namespace MinecraftLaunch.Classes.Interfaces;
 
-public class IGameProcessWatcher {
+public interface IGameProcessWatcher {
     public Process Process { get; }
 
     public IEnumerable<string> Arguments { get; }

diff --git a/MinecraftLaunch/Classes/Models/Game/LibraryJsonEntry.cs b/MinecraftLaunch/Classes/Models/Game/LibraryJsonEntry.cs
@@ -12,7 +12,7 @@ public sealed record LibraryJsonEntry {
     public DownloadsEntry Downloads { get; set; }
 
     [JsonPropertyName("natives")]
-    public Dictionary<Platform, string> Natives { get; set; }
+    public Dictionary<string, string> Natives { get; set; }
 }
 
 public sealed record RuleModel
@@ -21,7 +21,7 @@ public sealed record RuleModel
     public string Action { get; set; }
 
     [JsonPropertyName("os")]
-    public Dictionary<string, Platform> System { get; set; }
+    public Dictionary<string, string> System { get; set; }
 }
 
 [JsonSerializable(typeof(LibraryJsonEntry))]

diff --git a/MinecraftLaunch/Components/Converter/PlatformEnumToStringJsonConverter.cs b/MinecraftLaunch/Components/Converter/PlatformEnumToStringJsonConverter.cs
diff --git a/MinecraftLaunch/Components/Fetcher/JavaFetcher.cs b/MinecraftLaunch/Components/Fetcher/JavaFetcher.cs
@@ -72,9 +72,9 @@ public ImmutableArray<JavaEntry> Fetch() {
 
     public async ValueTask<ImmutableArray<JavaEntry>> FetchAsync() {
         return EnvironmentUtil.GetPlatformName() switch {
-            Platform.windows => FetchWindowJava(),
-            Platform.osx => await FetchMacJavaAsync(),
-            Platform.linux => await FetchLinuxJavaAsync(),
+            "windows" => FetchWindowJava(),
+            "osx" => await FetchMacJavaAsync(),
+            "linux" => await FetchLinuxJavaAsync(),
             _ => FetchWindowJava()
         };
     }

diff --git a/MinecraftLaunch/Components/Launcher/ArgumentsBuilder.cs b/MinecraftLaunch/Components/Launcher/ArgumentsBuilder.cs
@@ -134,9 +134,9 @@ private string GetNativesDirectory() {
     }
 
     private static IEnumerable<string> GetEnvironmentJvmArguments() {
-        Platform platformName = EnvironmentUtil.GetPlatformName();
-        if (!(platformName == Platform.windows)) {
-            if (platformName == Platform.osx)
+        string platformName = EnvironmentUtil.GetPlatformName();
+        if (!(platformName == "windows")) {
+            if (platformName == "osx")
                 yield return "-XstartOnFirstThread";
         } else {
             yield return "-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump";

diff --git a/MinecraftLaunch/Components/Launcher/Launcher.cs b/MinecraftLaunch/Components/Launcher/Launcher.cs
@@ -28,12 +28,13 @@ public async ValueTask<IGameProcessWatcher> LaunchAsync(string id) {
         var process = CreateProcess(arguments, versionPath);
 
         LibrariesResolver librariesResolver = new(gameEntry);
-        await ExtractNativesAndStartProcess(versionPath, librariesResolver, process);
+        await ExtractNatives(versionPath, librariesResolver, process);
         return new GameProcessWatcher(process, arguments);
     }
 
     private Process CreateProcess(IEnumerable<string> arguments, string versionPath) {
         return new Process {
+            EnableRaisingEvents = true,
             StartInfo = new ProcessStartInfo {
                 FileName = LaunchConfig.JvmConfig.JavaPath.FullName,
                 Arguments = string.Join(' '.ToString(), arguments),
@@ -42,18 +43,15 @@ private Process CreateProcess(IEnumerable<string> arguments, string versionPath)
                 RedirectStandardError = true,
                 WorkingDirectory = versionPath
             },
-
-            EnableRaisingEvents = true
         };
     }
 
-    private async Task ExtractNativesAndStartProcess(string versionPath, LibrariesResolver librariesResolver, Process process) {
+    private async Task ExtractNatives(string versionPath, LibrariesResolver librariesResolver, Process process) {
         var libraries = librariesResolver.GetLibraries()
             .Where(x => ((x as LibraryEntry)?.IsNative) != null)
             .Select(x => x.Path)
             .ToList();
 
         await Task.Run(() => ZipUtil.ExtractNatives(Path.Combine(versionPath, "natives"), libraries));
-        process.Start();
     }
 }
diff --git a/MinecraftLaunch/Components/Resolver/LibrariesResolver.cs b/MinecraftLaunch/Components/Resolver/LibrariesResolver.cs
@@ -130,13 +130,13 @@ private bool GetLibraryEnable(IEnumerable<RuleModel> rules) {
 
                 foreach (var os in item.System) {
                     switch (os.Value) {
-                        case Platform.windows:
+                        case "windows":
                             windows = true;
                             break;
-                        case Platform.linux:
+                        case "linux":
                             linux = true;
                             break;
-                        case Platform.osx:
+                        case "osx":
                             osx = true;
                             break;
                     }
@@ -149,13 +149,13 @@ private bool GetLibraryEnable(IEnumerable<RuleModel> rules) {
 
                 foreach (var os in item.System) {
                     switch (os.Value) {
-                        case Platform.windows:
+                        case "windows":
                             windows = false;
                             break;
-                        case Platform.linux:
+                        case "linux":
                             linux = false;
                             break;
-                        case Platform.osx:
+                        case "osx":
                             osx = false;
                             break;
                     }
@@ -164,9 +164,9 @@ private bool GetLibraryEnable(IEnumerable<RuleModel> rules) {
         }
 
         return EnvironmentUtil.GetPlatformName() switch {
-            Platform.windows => windows,
-            Platform.linux=> linux,
-            Platform.osx => osx,
+            "windows" => windows,
+            "linux" => linux,
+            "osx" => osx,
             _ => false,
         };
     }

diff --git a/MinecraftLaunch/Components/Watcher/GameProcessWatcher.cs b/MinecraftLaunch/Components/Watcher/GameProcessWatcher.cs
@@ -7,7 +7,7 @@ namespace MinecraftLaunch.Components.Watcher;
 /// <summary>
 /// 游戏进程监视器
 /// </summary>
-public sealed class GameProcessWatcher : IGameProcessWatcher {
+public class GameProcessWatcher : IGameProcessWatcher {
     public Process Process { get; }
 
     public IEnumerable<string> Arguments { get; }
@@ -19,9 +19,11 @@ public sealed class GameProcessWatcher : IGameProcessWatcher {
     public GameProcessWatcher(Process process, IEnumerable<string> arguments) {
         Process = process;
         Arguments = arguments;
-        process.Exited += OnExited;
+        process.Exited += OnExited;      
         process.ErrorDataReceived += OnOutputDataReceived;
         process.OutputDataReceived += OnOutputDataReceived;
+        process.Start();
+
         process.BeginErrorReadLine();
         process.BeginOutputReadLine();
     }

diff --git a/MinecraftLaunch/Extensions/JsonExtension.cs b/MinecraftLaunch/Extensions/JsonExtension.cs
@@ -47,11 +47,11 @@ public static bool GetBool(this JsonNode node, string name) {
     }
 
     public static string GetString(this JsonNode node) {
-        return node.GetValue<string>();
+        return node?.GetValue<string>();
     }
 
     public static string GetString(this JsonNode node, string name) {
-        return node[name].GetValue<string>();
+        return node[name]?.GetValue<string>();
     }
 
     public static JsonArray GetEnumerable(this JsonNode node) {

diff --git a/MinecraftLaunch/MinecraftLaunch.csproj b/MinecraftLaunch/MinecraftLaunch.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<Version>3.0.0-preview9</Version>
+		<Version>3.0.0-preview10</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/MinecraftLaunch/Utilities/EnvironmentUtil.cs b/MinecraftLaunch/Utilities/EnvironmentUtil.cs
@@ -16,19 +16,19 @@ public static bool IsLinux
     public static bool IsWindow
         => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 
-    public readonly static Dictionary<Func<bool>, Platform> PlatformDirectory = new() {
-        { () => IsMac, Platform.osx },
-        { () => IsLinux, Platform.linux },
-        { () => IsWindow, Platform.windows }
+    public readonly static Dictionary<Func<bool>, string> PlatformDirectory = new() {
+        { () => IsMac, "osx" },
+        { () => IsLinux, "linux" },
+        { () => IsWindow, "windows" }
     };
 
-    public static Platform GetPlatformName() {
+    public static string GetPlatformName() {
         foreach (var item in PlatformDirectory) {
             if (item.Key.Invoke()) {
                 return item.Value;
             }
         }
 
-        return Platform.unknown;
+        return "";
     }
 }
diff --git a/MinecraftLaunch/Utilities/JsonConverterUtil.cs b/MinecraftLaunch/Utilities/JsonConverterUtil.cs
@@ -16,8 +16,6 @@ private static JsonSerializerOptions Get() {
         };
 
         options.Converters.Add(new AccountJsonConverter());
-        options.Converters.Add(new PlatformEnumToStringJsonConverter());
-
         return options;
     }
 }
diff --git a/MinecraftLaunch/Utilities/ZipUtil.cs b/MinecraftLaunch/Utilities/ZipUtil.cs
@@ -12,9 +12,9 @@ public static void ExtractNatives(string targetFolder, IEnumerable<string> files
         DirectoryUtil.DeleteAllFiles(targetFolder);
 
         var extension = EnvironmentUtil.GetPlatformName() switch {
-            Platform.windows => ".dll",
-            Platform.linux => ".so",
-            Platform.osx => ".dylib",
+            "windows" => ".dll",
+            "linux" => ".so",
+            "osx" => ".dylib",
             _ => "."
         };