remove unused APIs

Corona-Studio · Oct 23, 2023 · 5843a3e · 5843a3e
1 parent b5c66e5
commit 5843a3e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 269 deletions.
diff --git a/ProjBobcat/ProjBobcat/Class/Helper/SystemInfo/SystemArch.cs b/ProjBobcat/ProjBobcat/Class/Helper/SystemInfo/SystemArch.cs
diff --git a/ProjBobcat/ProjBobcat/Class/Helper/SystemInfo/WindowsSystemVersion.cs b/ProjBobcat/ProjBobcat/Class/Helper/SystemInfo/WindowsSystemVersion.cs
diff --git a/ProjBobcat/ProjBobcat/Class/Helper/SystemInfoHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/SystemInfoHelper.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Microsoft.Extensions.Configuration;
 using ProjBobcat.Class.Model;
 
@@ -12,6 +13,17 @@ namespace ProjBobcat.Class.Helper;
 /// </summary>
 public static class SystemInfoHelper
 {
+    public static string GetSystemArch()
+    {
+        return RuntimeInformation.OSArchitecture switch
+        {
+            Architecture.X86 => "x86",
+            Architecture.X64 => "x64",
+            Architecture.Arm64 => "arm64",
+            var arch => throw new Exception($"Unknown system arch: {arch}")
+        };
+    }
+
     public static bool IsRunningUnderTranslation()
     {
 #if WINDOWS

diff --git a/ProjBobcat/ProjBobcat/Class/Model/JvmRulesModel.cs b/ProjBobcat/ProjBobcat/Class/Model/JvmRulesModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Text.Json.Serialization;
-using ProjBobcat.Class.Helper.SystemInfo;
+using ProjBobcat.Class.Helper;
 
 namespace ProjBobcat.Class.Model;
 
@@ -16,7 +16,7 @@ public bool IsAllow()
     {
         if (!string.IsNullOrEmpty(Name) &&
             !Name.Equals(Constants.OsSymbol, StringComparison.OrdinalIgnoreCase)) return false;
-        if (!string.IsNullOrEmpty(Arch) && Arch != SystemArch.CurrentArch.ToString()) return false;
+        if (!string.IsNullOrEmpty(Arch) && Arch != SystemInfoHelper.GetSystemArch()) return false;
 #if WINDOWS
         if (!string.IsNullOrEmpty(Version) && Version != $"^{WindowsSystemVersion.CurrentVersion}\\.") return false;
 #endif

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs
@@ -5,7 +5,6 @@
 using System.Text.Json;
 using ProjBobcat.Class;
 using ProjBobcat.Class.Helper;
-using ProjBobcat.Class.Helper.SystemInfo;
 using ProjBobcat.Class.Model;
 using ProjBobcat.Class.Model.JsonContexts;
 using ProjBobcat.Class.Model.LauncherProfile;
@@ -199,7 +198,7 @@ public override (List<NativeFileInfo>, List<FileInfo>) GetNatives(IEnumerable<Li
 
                 if(!lib.Natives!.TryGetValue(Constants.OsSymbol, out var value)) continue;
 
-                var key = value.Replace("${arch}", SystemArch.CurrentArch.ToString("{0}"));
+                var key = value.Replace("${arch}", SystemInfoHelper.GetSystemArch());
 
                 FileInfo libFi;
                 if (lib.Downloads?.Classifiers?.ContainsKey(key) ?? false)