feat: 添加联机功能

PCL.Mac.Core/Task/MyTask.swift

@@ -31,12 +31,7 @@ public class MyTask<Model: TaskModel>: ObservableObject, Identifiable {
     private let model: Model
     private var cancellables: [AnyCancellable] = []
 
-    /// 创建一个任务。
-    /// - Parameters:
-    ///   - name: 任务名。
-    ///   - model: 任务模型，用于在子任务间共享数据。
-    ///   - subTasks: 该任务的子任务列表。
-    public init(name: String, model: Model, _ subTasks: SubTask...) {
+    private init(name: String, model: Model, _ subTasks: [SubTask]) {
         self.name = name
         self.model = model
         self.subTasks = subTasks
@@ -47,6 +42,15 @@ public class MyTask<Model: TaskModel>: ObservableObject, Identifiable {
         }
     }
 
+    /// 创建一个任务。
+    /// - Parameters:
+    ///   - name: 任务名。
+    ///   - model: 任务模型，用于在子任务间共享数据。
+    ///   - subTasks: 该任务的子任务列表。
+    public convenience init(name: String, model: Model, _ subTasks: SubTask...) {
+        self.init(name: name, model: model, subTasks)
+    }
+
     /// 开始按顺序执行任务。
     /// 执行时，会按 `ordinal` 将 `subTasks` 分组，`ordinal` 越小的越先执行。
     public func start() async throws {
@@ -137,6 +141,16 @@ public class MyTask<Model: TaskModel>: ObservableObject, Identifiable {
     }
 }
 
+extension MyTask where Model == EmptyModel {
+    /// 当任务不需要共享模型数据时的便捷构造函数。
+    /// - Parameters:
+    ///   - name: 任务名。
+    ///   - subTasks: 子任务列表。
+    public convenience init(name: String, _ subTasks: SubTask...) {
+        self.init(name: name, model: EmptyModel(), subTasks)
+    }
+}
+
 public enum SubTaskState {
     case waiting, executing, finished, failed
 }

PCL.Mac.Core/Utils/Architecture.swift

@@ -64,4 +64,12 @@ public enum Architecture: String {
         default: return .unknown
         }
     }
+
+    public static func systemArchitecture() -> Architecture {
+        #if arch(arm64)
+        return .arm64
+        #elseif arch(x86_64)
+        return .x64
+        #endif
+    }
 }

PCL.Mac.Core/Utils/FileUtils.swift

@@ -28,4 +28,8 @@ public enum FileUtils {
         let digest: Insecure.SHA1.Digest = hasher.finalize()
         return digest.map { String(format: "%02x", $0) }.joined()
     }
+
+    public static func isExecutable(at url: URL) -> Bool {
+        return Architecture.architecture(of: url) != .unknown
+    }
 }

PCL.Mac.Core/Utils/Requests.swift

@@ -80,6 +80,7 @@ public enum Requests {
         var request: URLRequest = .init(url: url)
         request.httpMethod = method
         request.allHTTPHeaderFields = headers
+        request.setValue("PCL-Mac/0.1.1", forHTTPHeaderField: "User-Agent")
         if noCache {
             request.cachePolicy = .reloadIgnoringLocalCacheData
         }

PCL.Mac.Core/Utils/URLConstants.swift

@@ -17,12 +17,14 @@ public struct URLConstants {
     public static let cacheURL: URL = applicationSupportURL.appending(path: "Caches")
     public static let temperatureURL: URL = applicationSupportURL.appending(path: "Temp")
     public static let authlibInjectorURL: URL = applicationSupportURL.appending(path: "authlib-injector.jar")
+    public static let easyTierURL: URL = applicationSupportURL.appending(path: "EasyTier")
 
     public static func createDirectories() {
         let fileManager: FileManager = .default
         try? fileManager.createDirectory(at: applicationSupportURL, withIntermediateDirectories: true)
         try? fileManager.createDirectory(at: logsDirectoryURL, withIntermediateDirectories: true)
         try? fileManager.createDirectory(at: cacheURL, withIntermediateDirectories: true)
         try? fileManager.createDirectory(at: temperatureURL, withIntermediateDirectories: true)
+        try? fileManager.createDirectory(at: easyTierURL, withIntermediateDirectories: true)
     }
 }

PCL.Mac.xcodeproj/project.pbxproj

@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		EC114A4A2ED05F070027201F /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = EC114A492ED05F070027201F /* SwiftyJSON */; };
+		EC3785B02F2F55650008B483 /* SwiftScaffolding in Frameworks */ = {isa = PBXBuildFile; productRef = EC3785AF2F2F55650008B483 /* SwiftScaffolding */; };
+		EC971F4B2F2CB23E006CFFF0 /* SwiftScaffolding in Frameworks */ = {isa = PBXBuildFile; productRef = EC971F4A2F2CB23E006CFFF0 /* SwiftScaffolding */; };
 		EC996B442EBEE80F0094E524 /* Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EC996B3C2EBEE80F0094E524 /* Core.framework */; };
 		EC996B462EBEE80F0094E524 /* Core.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EC996B3C2EBEE80F0094E524 /* Core.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		ECE995B32ED6BE2E00E86582 /* ZIPFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = ECE995B22ED6BE2E00E86582 /* ZIPFoundation */; };
@@ -116,6 +118,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				ECF707982ED8291F001F0C71 /* SwiftyJSON in Frameworks */,
+				EC3785B02F2F55650008B483 /* SwiftScaffolding in Frameworks */,
+				EC971F4B2F2CB23E006CFFF0 /* SwiftScaffolding in Frameworks */,
 				EC996B442EBEE80F0094E524 /* Core.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -237,6 +241,8 @@
 			name = PCL.Mac;
 			packageProductDependencies = (
 				EC114A472ED05F020027201F /* SwiftyJSON */,
+				EC971F4A2F2CB23E006CFFF0 /* SwiftScaffolding */,
+				EC3785AF2F2F55650008B483 /* SwiftScaffolding */,
 			);
 			productName = PCL.Mac;
 			productReference = ECC26BC32EBEDD67002B7E3E /* PCL.Mac.app */;
@@ -278,6 +284,7 @@
 			packageReferences = (
 				EC114A452ED05EF50027201F /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
 				ECE995B12ED6BE2E00E86582 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
+				EC3785AE2F2F55650008B483 /* XCRemoteSwiftPackageReference "SwiftScaffolding" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = ECC26BC42EBEDD67002B7E3E /* Products */;
@@ -701,6 +708,14 @@
 				minimumVersion = 5.0.2;
 			};
 		};
+		EC3785AE2F2F55650008B483 /* XCRemoteSwiftPackageReference "SwiftScaffolding" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/CeciliaStudio/SwiftScaffolding";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.1.1;
+			};
+		};
 		ECE995B12ED6BE2E00E86582 /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/weichsel/ZIPFoundation";
@@ -727,6 +742,15 @@
 			package = EC114A452ED05EF50027201F /* XCRemoteSwiftPackageReference "SwiftyJSON" */;
 			productName = SwiftyJSON;
 		};
+		EC3785AF2F2F55650008B483 /* SwiftScaffolding */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = EC3785AE2F2F55650008B483 /* XCRemoteSwiftPackageReference "SwiftScaffolding" */;
+			productName = SwiftScaffolding;
+		};
+		EC971F4A2F2CB23E006CFFF0 /* SwiftScaffolding */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = SwiftScaffolding;
+		};
 		ECE995B22ED6BE2E00E86582 /* ZIPFoundation */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = ECE995B12ED6BE2E00E86582 /* XCRemoteSwiftPackageReference "ZIPFoundation" */;

PCL.Mac/App/AppDelegate.swift

@@ -8,24 +8,29 @@
 import Foundation
 import AppKit
 import Core
+import SwiftScaffolding
 
 class AppDelegate: NSObject, NSApplicationDelegate {
     private var window: AppWindow!
 
-    private func executeTask(_ name: String, _ start: @escaping () throws -> Void) {
+    private func executeTask(_ name: String, silent: Bool = false, _ start: @escaping () throws -> Void) {
         do {
             try start()
-            log("\(name)成功")
+            if !silent {
+                log("\(name)成功")
+            }
         } catch {
             err("\(name)失败：\(error.localizedDescription)")
         }
     }
 
-    private func executeAsyncTask(_ name: String, _ start: @escaping () async throws -> Void) {
+    private func executeAsyncTask(_ name: String, silent: Bool = false, _ start: @escaping () async throws -> Void) {
         Task {
             do {
                 try await start()
-                log("\(name)成功")
+                if !silent {
+                    log("\(name)成功")
+                }
             } catch {
                 err("\(name)失败：\(error.localizedDescription)")
             }
@@ -36,6 +41,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         URLConstants.createDirectories()
         LogManager.shared.enableLogging()
         log("正在启动 PCL.Mac.Refactor \(Metadata.appVersion)")
+        executeTask("开启 SwiftScaffolding 日志", silent: true) {
+            try SwiftScaffolding.Logger.enableLogging(url: URLConstants.logsDirectoryURL.appending(path: "swift-scaffolding.log"))
+        }
         _ = LauncherConfig.shared
         executeTask("加载版本缓存") {
             try VersionCache.load()
@@ -81,5 +89,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         executeTask("保存启动器配置") {
             try LauncherConfig.save()
         }
+        EasyTierManager.shared.easyTier.terminate()
     }
 }

PCL.Mac/App/AppRouter.swift

@@ -18,6 +18,9 @@ enum AppRoute: Identifiable, Hashable, Equatable {
     // 下载页面的子页面
     case minecraftDownload, downloadPage2, downloadPage3
 
+    // 联机页面的子页面
+    case multiplayerSub, multiplayerSettings
+
     // 更多页面的子页面
     case about
 
@@ -54,6 +57,10 @@ class AppRouter: ObservableObject {
             InstanceListPage(repository: repository)
         case .noInstanceRepository:
             NoInstanceRepositoryPage()
+        case .multiplayerSub:
+            MultiplayerPage()
+        case .multiplayerSettings:
+            MultiplayerSettingsPage()
         case .about:
             AboutPage()
         default:
@@ -67,6 +74,7 @@ class AppRouter: ObservableObject {
         case .launch: LaunchSidebar()
         case .instanceList, .noInstanceRepository: InstanceListSidebar()
         case .minecraftDownload, .downloadPage2, .downloadPage3: DownloadSidebar()
+        case .multiplayer, .multiplayerSub, .multiplayerSettings: MultiplayerSidebar()
         case .more, .about: MoreSidebar()
         case .tasks: TasksSidebar()
         default: EmptySidebar()
@@ -107,6 +115,7 @@ class AppRouter: ObservableObject {
         // 各根页面的默认子页面
         if newRoot == .download { append(.minecraftDownload) }
         if newRoot == .more { append(.about) }
+        if newRoot == .multiplayer { append(.multiplayerSub) }
     }
 
     func append(_ route: AppRoute) {

PCL.Mac/App/AppWindow.swift

@@ -29,6 +29,7 @@ class AppWindow: NSWindow {
                 .environmentObject(InstanceViewModel())
                 .environmentObject(MinecraftDownloadPageViewModel())
                 .environmentObject(InstanceListViewModel())
+                .environmentObject(MultiplayerViewModel())
         )
 
         self.setFrameAutosaveName("AppWindow")

PCL.Mac/App/LauncherConfig.swift

@@ -35,6 +35,7 @@ class LauncherConfig: Codable {
     public var currentInstance: String?
     public var accounts: [Account] = []
     public var currentAccountId: UUID?
+    public var multiplayerDisclaimerAgreed: Bool = false
 
     public init() {}
 
@@ -58,6 +59,7 @@ class LauncherConfig: Codable {
                 self.currentAccountId = accounts[0].id
             }
         }
+        self.multiplayerDisclaimerAgreed = try container.decodeIfPresent(Bool.self, forKey: .multiplayerDisclaimerAgreed) ?? false
     }
 
     public func encode(to encoder: any Encoder) throws {
@@ -67,6 +69,7 @@ class LauncherConfig: Codable {
         try container.encode(currentInstance, forKey: .currentInstance)
         try container.encode(accounts.map(AccountWrapper.init(_:)), forKey: .accounts)
         try container.encode(currentAccountId, forKey: .currentAccountId)
+        try container.encode(multiplayerDisclaimerAgreed, forKey: .multiplayerDisclaimerAgreed)
     }
 
     public static func save(_ config: LauncherConfig = .shared, to url: URL = URLConstants.configURL) throws {
@@ -80,5 +83,6 @@ class LauncherConfig: Codable {
         case currentInstance
         case accounts
         case currentAccountId
+        case multiplayerDisclaimerAgreed
     }
 }

PCL.Mac/Assets.xcassets/Icons/IconCopy.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "IconCopy.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

PCL.Mac/Assets.xcassets/Icons/IconExit.imageset/Contents.json

@@ -0,0 +1,25 @@
+{
+  "images" : [
+    {
+      "filename" : "IconExit.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

PCL.Mac/Components/MyCard.swift

@@ -24,12 +24,14 @@ struct MyCard<Content: View>: View {
     private let title: String
     private let foldable: Bool
     private let titled: Bool
+    private let limitHeight: Bool
     private let content: () -> Content
 
-    init(_ title: String, foldable: Bool = true, titled: Bool = true, @ViewBuilder _ content: @escaping () -> Content) {
+    init(_ title: String, foldable: Bool = true, titled: Bool = true, limitHeight: Bool = true, @ViewBuilder _ content: @escaping () -> Content) {
         self.title = title
         self.foldable = foldable && titled
         self.titled = titled
+        self.limitHeight = limitHeight
         self.content = content
     }
 
@@ -93,7 +95,8 @@ struct MyCard<Content: View>: View {
                         }
                 }
             }
-            .frame(height: internalContentHeight, alignment: .top)
+            .frame(height: limitHeight ? internalContentHeight : nil, alignment: .top)
+            .frame(maxHeight: limitHeight ? nil : .infinity)
             .clipped()
             .opacity(showContent ? 1 : 0)
         }