use better task wait

Corona-Studio · Nov 5, 2024 · bfc91fc · bfc91fc
1 parent 1220ad8
commit bfc91fc
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/MicrosoftAuthenticator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/MicrosoftAuthenticator.cs
@@ -66,7 +66,7 @@ public MicrosoftAuthenticator()
 
     public AuthResultBase Auth(bool userField = false)
     {
-        return AuthTaskAsync(userField).Result;
+        return AuthTaskAsync(userField).GetAwaiter().GetResult();
     }
 
     public async Task<AuthResultBase> AuthTaskAsync(bool userField = false)

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/OfflineAuthenticator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/OfflineAuthenticator.cs
@@ -110,7 +110,7 @@ public AuthResultBase Auth(bool userField = false)
     /// <returns></returns>
     public Task<AuthResultBase> AuthTaskAsync(bool userField)
     {
-        return Task.Run(() => Auth());
+        return Task.FromResult(Auth());
     }
 
     /// <summary>

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/YggdrasilAuthenticator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/YggdrasilAuthenticator.cs
@@ -81,7 +81,7 @@ public class YggdrasilAuthenticator : IAuthenticator
     /// <returns></returns>
     public AuthResultBase Auth(bool userField = false)
     {
-        return AuthTaskAsync().Result;
+        return AuthTaskAsync().GetAwaiter().GetResult();
     }
 
     /// <summary>

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/DefaultResourceCompleter.cs b/ProjBobcat/ProjBobcat/DefaultComponent/DefaultResourceCompleter.cs
@@ -35,7 +35,7 @@ public class DefaultResourceCompleter : IResourceCompleter
 
     public TaskResult<ResourceCompleterCheckResult?> CheckAndDownload()
     {
-        return CheckAndDownloadTaskAsync().Result;
+        return CheckAndDownloadTaskAsync().GetAwaiter().GetResult();
     }
 
     public async Task<TaskResult<ResourceCompleterCheckResult?>> CheckAndDownloadTaskAsync()

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/FabricInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/FabricInstaller.cs
@@ -19,7 +19,7 @@ public class FabricInstaller : InstallerBase, IFabricInstaller
 
     public string Install()
     {
-        return InstallTaskAsync().Result;
+        return InstallTaskAsync().GetAwaiter().GetResult();
     }
 
     public async Task<string> InstallTaskAsync()

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/HighVersionForgeInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/HighVersionForgeInstaller.cs
@@ -44,7 +44,7 @@ public partial class HighVersionForgeInstaller : InstallerBase, IForgeInstaller
 
     public ForgeInstallResult InstallForge()
     {
-        return InstallForgeTaskAsync().Result;
+        return InstallForgeTaskAsync().GetAwaiter().GetResult();
     }
 
     ForgeInstallResult GetCorruptedFileResult()

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/LegacyForgeInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/LegacyForgeInstaller.cs
@@ -34,7 +34,7 @@ public string DownloadUrlRoot
 
     public ForgeInstallResult InstallForge()
     {
-        return InstallForgeTaskAsync().Result;
+        return InstallForgeTaskAsync().GetAwaiter().GetResult();
     }
 
     public async Task<ForgeInstallResult> InstallForgeTaskAsync()

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/LiteLoaderInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/LiteLoaderInstaller.cs
@@ -25,7 +25,7 @@ public class LiteLoaderInstaller : InstallerBase, ILiteLoaderInstaller
 
     public string Install()
     {
-        return InstallTaskAsync().Result;
+        return InstallTaskAsync().GetAwaiter().GetResult();
     }
 
     public async Task<string> InstallTaskAsync()

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ModPackInstaller/CurseForgeInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ModPackInstaller/CurseForgeInstaller.cs
@@ -25,7 +25,7 @@ public sealed class CurseForgeInstaller : ModPackInstallerBase, ICurseForgeInsta
 
     public void Install()
     {
-        InstallTaskAsync().Wait();
+        InstallTaskAsync().GetAwaiter().GetResult();
     }
 
     public static async Task<(string? FileName, string? Url)> TryGuessModDownloadLink(long fileId)

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ModPackInstaller/ModrinthInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ModPackInstaller/ModrinthInstaller.cs
@@ -38,7 +38,7 @@ public sealed class ModrinthInstaller : ModPackInstallerBase, IModrinthInstaller
 
     public void Install()
     {
-        InstallTaskAsync().Wait();
+        InstallTaskAsync().GetAwaiter().GetResult();
     }
 
     public async Task InstallTaskAsync()

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/OptifineInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/OptifineInstaller.cs
@@ -24,7 +24,7 @@ public class OptifineInstaller : InstallerBase, IOptifineInstaller
 
     public string Install()
     {
-        return InstallTaskAsync().Result;
+        return InstallTaskAsync().GetAwaiter().GetResult();
     }
 
     public async Task<string> InstallTaskAsync()

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/QuiltInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/QuiltInstaller.cs
@@ -25,7 +25,7 @@ public class QuiltInstaller : InstallerBase, IQuiltInstaller
 
     public string Install()
     {
-        return InstallTaskAsync().Result;
+        return InstallTaskAsync().GetAwaiter().GetResult();
     }
 
     public async Task<string> InstallTaskAsync()

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/GameCore/GameCoreBase.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/GameCore/GameCoreBase.cs
@@ -46,7 +46,7 @@ public event EventHandler<LaunchLogEventArgs> LaunchLogEventDelegate
     /// <returns></returns>
     public virtual LaunchResult Launch(LaunchSettings settings)
     {
-        return LaunchTaskAsync(settings).Result;
+        return LaunchTaskAsync(settings).GetAwaiter().GetResult();
     }
 
     /// <summary>

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/ResourceInfoResolver/ResolverBase.cs b/ProjBobcat/ProjBobcat/DefaultComponent/ResourceInfoResolver/ResolverBase.cs
@@ -28,7 +28,7 @@ public event EventHandler<GameResourceInfoResolveEventArgs> GameResourceInfoReso
 
     public virtual IEnumerable<IGameResource> ResolveResource()
     {
-        return ResolveResourceAsync().ToListAsync().Result;
+        return ResolveResourceAsync().ToListAsync().GetAwaiter().GetResult();
     }
 
     public void Dispose()