Merge pull request #106 from Corona-Studio/hotfix

[Bugfix] Forge launch issue
Corona-Studio · Jan 2, 2024 · 581d59c · 581d59c
2 parents 150f8c2 + eedb0fe
commit 581d59c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/ProjBobcat/ProjBobcat/Class/Model/MavenInfo.cs b/ProjBobcat/ProjBobcat/Class/Model/MavenInfo.cs
@@ -4,7 +4,7 @@
 ///     Maven包的有关信息。
 ///     Maven Package Information.
 /// </summary>
-public class MavenInfo
+public record MavenInfo
 {
     /// <summary>
     ///     组织名。

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs
@@ -188,6 +188,19 @@ public override (List<NativeFileInfo>, List<FileInfo>) GetNatives(Library[] libr
             // 不同版本的Minecraft有不同的library JSON字符串的结构。
             // Different versions of Minecraft have different library JSON's structure.
 
+            // Fix for new native format introduced in 1.19
+            if (lib.Name.Contains("natives", StringComparison.OrdinalIgnoreCase) &&
+                lib.Downloads?.Artifact != null)
+            {
+                result.Item1.Add(new NativeFileInfo
+                {
+                    Extract = lib.Extract,
+                    FileInfo = lib.Downloads.Artifact
+                });
+
+                continue;
+            }
+
             var isNative = (lib.Natives?.Count ?? 0) > 0;
             if (isNative)
             {
@@ -263,22 +276,20 @@ public override (List<NativeFileInfo>, List<FileInfo>) GetNatives(Library[] libr
 
             if (lib.Downloads?.Artifact != null)
             {
-                if (lib.Downloads.Artifact.Name == null)
-                {
+                if (string.IsNullOrEmpty(lib.Downloads.Artifact.Name))
                     lib.Downloads.Artifact.Name = lib.Name;
-
-                    if (!result.Item2.Any(l => l.Name!.Equals(lib.Name, StringComparison.OrdinalIgnoreCase)))
-                        result.Item2.Add(lib.Downloads.Artifact);
-                }
+
+                if (!result.Item2.Any(l => l.Name!.Equals(lib.Name, StringComparison.OrdinalIgnoreCase)))
+                    result.Item2.Add(lib.Downloads.Artifact);
             }
             else
             {
-                if ((lib.Natives?.Count ?? 0) == 0)
-                    if (!result.Item2.Any(l => l.Name!.Equals(lib.Name, StringComparison.OrdinalIgnoreCase)))
-                        result.Item2.Add(new FileInfo
-                        {
-                            Name = lib.Name
-                        });
+                if ((lib.Natives?.Count ?? 0) != 0) continue;
+                if (!result.Item2.Any(l => l.Name!.Equals(lib.Name, StringComparison.OrdinalIgnoreCase)))
+                    result.Item2.Add(new FileInfo
+                    {
+                        Name = lib.Name
+                    });
             }
         }
 
@@ -441,7 +452,7 @@ public override (List<NativeFileInfo>, List<FileInfo>) GetNatives(Library[] libr
                             continue;
 
                         var lMaven = result.Libraries[j].Name!.ResolveMavenString()!;
-                        if (!lMaven.GetMavenFullName().Equals(mLMaven.GetMavenFullName(), StringComparison.Ordinal))
+                        if (lMaven != mLMaven)
                             continue;
 
                         var v1 = new ComparableVersion(lMaven.Version);