Fixed

Author: ahpxex

ModuleLauncher.NET.Mods/Models/Utils/ModInfo.cs

@@ -12,5 +12,5 @@ public class ModInfo
 
     public string? License { get; set; }
 
-    public List<string?>? Authors { get; set; }
+    public List<string>? Authors { get; set; }
 }

ModuleLauncher.NET.Mods/Utilities/ModUtils.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO.Compression;
-using Manganese.Array;
 using Manganese.Text;
 using ModuleLauncher.NET.Mods.Models.Exceptions;
 using ModuleLauncher.NET.Mods.Models.Utils;
@@ -20,16 +19,16 @@ public static async Task<ModInfo> GetModInfoAsync(FileInfo mod)
     {
         var archive = ZipFile.OpenRead(mod.FullName);
         if (archive.Entries.Any(e => e.Name == "mcmod.info"))
-            return await GetModInfoLegacyForgeAsync(mod, archive);
+            return await GetModInfoLegacyForgeAsync(archive);
         if (archive.Entries.Any(e => e.Name == "mods.toml"))
-            return await GetModInfoForgeAsync(mod, archive);
+            return await GetModInfoForgeAsync(archive);
         if (archive.Entries.Any(e => e.Name is "fabric.mod.json" or "quilt.mod.json"))
-            return getModInfoFabricAsync(mod, archive);
+            return await GetModInfoFabricAsync(archive);
 
         throw new UnknownModException("Unknown mod or mod is corrupted");
     }
 
-    private static async Task<ModInfo> GetModInfoLegacyForgeAsync(FileInfo mod, ZipArchive archive)
+    private static async Task<ModInfo> GetModInfoLegacyForgeAsync(ZipArchive archive)
     {
         var zipEntry = archive.GetEntry("mcmod.info")!;
         await using var stream = zipEntry.Open();
@@ -48,32 +47,57 @@ private static async Task<ModInfo> GetModInfoLegacyForgeAsync(FileInfo mod, ZipA
 
         return re;
     }
-    
-    private static async Task<ModInfo> GetModInfoForgeAsync(FileInfo mod, ZipArchive archive)
+
+    private static async Task<ModInfo> GetModInfoForgeAsync(ZipArchive archive)
     {
         var zipEntry = archive.GetEntry("META-INF/mods.toml")!;
         await using var stream = zipEntry.Open();
         using var raw = new StreamReader(stream);
+
         var tomTable = TOML.Parse(raw);
         var modNode = tomTable["mods"].AsArray[0];
         var re = new ForgeModInfo
         {
             Id = modNode["modId"],
-            Version = modNode["version"],
-            Name = modNode["displayName"],
-            Url = modNode["displayURL"],
-            License = tomTable["license"],
-            Description = modNode["description"],
-            Authors = modNode.IsArray
-                ? modNode["authors"].AsArray.RawArray.Select(x => x.ToString()).ToList()
-                : new List<string> { modNode["authors"] },
+            Version = modNode["version"].HasValue ? modNode["version"] : tomTable["version"],
+            Name = modNode["displayName"].HasValue ? modNode["displayName"] : tomTable["displayName"],
+            Url = modNode["displayURL"].HasValue ? modNode["displayURL"] : tomTable["displayURL"],
+            License = tomTable["license"].HasValue ? tomTable["license"] : modNode["license"],
+            Description = modNode["description"].HasValue ? modNode["description"] : tomTable["descrption"],
         };
-        
+
+        if (modNode["authors"].HasValue)
+            re.Authors = modNode["authors"].IsArray
+                ? modNode["authors"].AsArray.RawArray.Select(x => x.ToString()).ToList()!
+                : new List<string> { modNode["authors"] };
+        else
+            re.Authors = tomTable["authors"].IsArray
+                ? tomTable["authors"].AsArray.RawArray.Select(x => x.ToString()).ToList()!
+                : new List<string> { tomTable["authors"] };
+
         return re;
     }
 
-    private static ModInfo getModInfoFabricAsync(FileInfo mod, ZipArchive archive)
+    private static async Task<ModInfo> GetModInfoFabricAsync(ZipArchive archive)
     {
-        return new ModInfo();
+        var zipEntry = archive.GetEntry("quilt.mod.json") ?? archive.GetEntry("fabric.mod.json");
+        await using var stream = zipEntry!.Open();
+        using var raw = new StreamReader(stream);
+        var content = await raw.ReadToEndAsync();
+
+        var re = new FabricModInfo
+        {
+            Id = content.Fetch("id"),
+            Name = content.Fetch("name"),
+            Description = content.Fetch("description"),
+            Version = content.Fetch("version"),
+            Authors = (content.FetchJToken("authorList") ?? content.FetchJToken("authors"))?.Select(t => t.ToString()).ToList(),
+            License = content.Fetch("license"),
+            HomePage = content.Fetch("contact.homepage"),
+            Issues = content.Fetch("contact.issues"),
+            Sources = content.Fetch("contact.sources")
+        };
+
+        return re;
     }
 }

ModuleLauncher.NET.Runtime/Program.cs

@@ -1,8 +1,13 @@
-using ModuleLauncher.NET.Mods.Utilities;
+using Manganese.Text;
+using ModuleLauncher.NET.Mods.Utilities;
 using Tommy;
 
-var info = await ModUtils.GetModInfoAsync(@"C:\Users\ahpx\Downloads\jei-1.19.2-forge-11.5.0.297.jar");
-info.Print();
+while (true)
+{
+    var info = await ModUtils.GetModInfoAsync(AnsiConsole.Ask<string>("Mod [red]path[/]:").Trim('"'));
+    info.ToJsonString().Print();
+}
+
 
 static class RuntimeUtils
 {