fix neoforge mod & jumplist launch

Xcube-Studio · Sep 10, 2023 · 4844805 · 4844805
1 parent 46621bb
commit 4844805
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/Natsurainko.FluentCore b/Natsurainko.FluentCore
diff --git a/Natsurainko.FluentLauncher/Services/Launch/LaunchService.cs b/Natsurainko.FluentLauncher/Services/Launch/LaunchService.cs
@@ -399,32 +399,41 @@ private IEnumerable<string> GetExtraGameParameters(GameSpecialConfig specialConf
         }
     }
 
-    private static async void UpdateJumpList(GameInfo gameInfo)
+    private static void UpdateJumpList(GameInfo gameInfo) => Task.Run(async () =>
     {
         var jumpList = await JumpList.LoadCurrentAsync();
 
         var args = JsonSerializer.Serialize(gameInfo).ConvertToBase64();
-        var latest = jumpList.Items.Where(x => x.GroupName.Equals("Latest")).ToList();
+        var latest = jumpList.Items.Where(x =>
+        {
+            var gameInfo = JsonSerializer.Deserialize<GameInfo>(x.Arguments.Replace("/quick-launch ", string.Empty).ConvertFromBase64());
+
+            return x.GroupName.Equals("Latest") &&
+            Path.Exists(Path.Combine(gameInfo.MinecraftFolderPath, "versions", gameInfo.AbsoluteId, $"{gameInfo.AbsoluteId}.json"));
+        }).Take(6).ToList();
+
+        var jumpListItem = JumpListItem.CreateWithArguments($"/quick-launch {args}", gameInfo.Name);
 
-        if (!latest.Where(x => x.DisplayName.Equals(gameInfo.Name)).Any())
+        jumpListItem.Logo = new Uri(string.Format("ms-appx:///Assets/Icons/{0}.png", !gameInfo.IsVanilla ? "furnace_front" : gameInfo.Type switch
         {
-            var jumpListItem = JumpListItem.CreateWithArguments($"/quick-launch {args}", gameInfo.Name);
+            "release" => "grass_block_side",
+            "snapshot" => "crafting_table_front",
+            "old_beta" => "dirt_path_side",
+            "old_alpha" => "dirt_path_side",
+            _ => "grass_block_side"
+        }), UriKind.RelativeOrAbsolute);
 
-            jumpListItem.Logo = new Uri(string.Format("ms-appx:///Assets/Icons/{0}.png", !gameInfo.IsVanilla ? "furnace_front" : gameInfo.Type switch
-            {
-                "release" => "grass_block_side",
-                "snapshot" => "crafting_table_front",
-                "old_beta" => "dirt_path_side",
-                "old_alpha" => "dirt_path_side",
-                _ => "grass_block_side"
-            }), UriKind.RelativeOrAbsolute);
+        jumpListItem.GroupName = "Latest";
 
-            jumpListItem.GroupName = "Latest";
+        if (latest.Where(x => x.DisplayName.Equals(gameInfo.Name)).FirstOrDefault() is JumpListItem equalsItem)
+            latest.Remove(equalsItem);
 
-            jumpList.Items.Add(jumpListItem);
+        latest.Insert(0, jumpListItem);
+        jumpList.Items.Clear();
 
-        }
+        foreach (var item in latest)
+            jumpList.Items.Add(item);
 
         await jumpList.SaveAsync();
-    }
+    });
 }
diff --git a/Natsurainko.FluentLauncher/Utils/GameInfoExtensions.cs b/Natsurainko.FluentLauncher/Utils/GameInfoExtensions.cs
@@ -87,6 +87,7 @@ public static bool IsSupportMod(this GameInfo gameInfo)
 
         if (!(loaders.Contains(ModLoaderType.Forge) ||
             loaders.Contains(ModLoaderType.Fabric) ||
+            loaders.Contains(ModLoaderType.NeoForge) ||
             loaders.Contains(ModLoaderType.Quilt) ||
             loaders.Contains(ModLoaderType.LiteLoader)))
             return false;