Chip away at Swift 6

Author: STREGA

Macros/ECSMacros/ECSComponentMacro.swift

@@ -55,7 +55,7 @@ public struct ECSComponentMacro: MemberMacro, ExtensionMacro {
             return false
         })?.trimmedDescription ?? ""
 
-        var extensionBody = "\(access) static let componentID: GateEngine.ComponentID = .init()"
+        let extensionBody = "\(access) static let componentID: GateEngine.ComponentID = .init()"
 
 //        let find = try InitializerDeclSyntax("init()") {
 //            

Macros/ECSMacros/ECSSystemMacro.swift

@@ -53,11 +53,11 @@ public struct ECSSystemMacro: MemberMacro, ExtensionMacro {
     ) throws -> [SwiftSyntax.ExtensionDeclSyntax] {
         guard protocols.contains(where: {$0 == "GateEngine.System"}) == false else { return [] }
 
-        guard let classDecl = declaration.as(ClassDeclSyntax.self) else {
+        guard let /*classDecl*/_ = declaration.as(ClassDeclSyntax.self) else {
             throw SystemMacroError.notClass
         }
 
-        let className = classDecl.name.trimmed
+//        let className = classDecl.name.trimmed
 
 //        var protocols: [ExtensionDeclSyntax] = [try ProtocolDeclSyntax("GateEngine.System")] + protocols
 //        return protocols

Package.swift

@@ -269,6 +269,7 @@ let package = Package(
                     path: "Dependencies/miniz",
                     cSettings: [
                         .define("_CRT_SECURE_NO_WARNINGS", .when(platforms: [.windows])),
+                        .unsafeFlags(["-Wno-conversion"]),
                     ]),
 
             // libspng
@@ -281,6 +282,7 @@ let package = Package(
                         // When public, the miniz.h header crashes Clang on Windows since Swift 5.8.0
                         .headerSearchPath("src/"),
                         .define("_CRT_SECURE_NO_WARNINGS", .when(platforms: [.windows])),
+                        .unsafeFlags(["-Wno-conversion"]),
                     ]),
 
             // TrueType
@@ -290,6 +292,7 @@ let package = Package(
                         .define("STB_TRUETYPE_IMPLEMENTATION"), .define("STB_RECT_PACK_IMPLEMENTATION"),
                         .define("extern", to: "__declspec(dllexport) extern", .when(platforms: [.windows])),
                         .define("_CRT_SECURE_NO_WARNINGS", .when(platforms: [.windows])), // Silence warnings
+                        .unsafeFlags(["-Wno-conversion"]),
                     ]),
 
             // Gravity

Sources/GateEngine/ECS/3D Specific/ObjectAnimation/ObjectAnimation3DComponent.swift

@@ -119,8 +119,9 @@ extension ObjectAnimation3DComponent {
 }
 
 extension Entity {
+    @MainActor
     @inlinable
-    public var objectAnimation3DComponent: ObjectAnimation3DComponent {
-        return self[ObjectAnimation3DComponent.self]
+    public var objectAnimation3DComponent: ObjectAnimation3DComponent? {
+        return self.component(ofType: ObjectAnimation3DComponent.self)
     }
 }

Sources/GateEngine/ECS/3D Specific/Physics/OctreeComponent.swift

@@ -177,9 +177,7 @@ extension OctreeComponent {
 
         self.cleanEmptyNodes()
 
-        Task {@MainActor in
-            self.didLoad = true
-        }
+        self.didLoad = true
     }
 
     private func setup(size: Size3, offset: Position3, position: Position3) {

Sources/GateEngine/ECS/3D Specific/Rig/Rig3DComponent.swift

@@ -341,8 +341,9 @@ public class RigAttachmentComponent: Component {
 }
 
 extension Entity {
+    @MainActor
     @inlinable
-    public var rig3DComponent: Rig3DComponent {
-        return self[Rig3DComponent.self]
+    public var rig3DComponent: Rig3DComponent? {
+        return self.component(ofType: Rig3DComponent.self)
     }
 }

Sources/GateEngine/ECS/Base/Entity.swift

@@ -98,7 +98,6 @@ extension Entity {
     }
 
     @inlinable
-    @available(*, deprecated, message: "Accessing a ResourceConstrainedComponent directly is never safe. Use Entity.component(ofType:) instead.", renamed: "component(ofType:)")
     public subscript<T: ResourceConstrainedComponent>(_ type: T.Type) -> T {
         get {
             let componentID = type.componentID.value

Sources/GateEngine/Game.swift

@@ -16,14 +16,12 @@ public final class Game {
 
     public let delegate: any GameDelegate
 
-    @MainActor public private(set) var state: State! = nil
-    @MainActor internal private(set) var internalState: State! = nil
-
-    nonisolated(unsafe) public internal(set) lazy var info: Game.Info = Game.Info()
+    nonisolated public let info: Game.Info
 
     nonisolated public let isHeadless: Bool
     @MainActor internal init(delegate: any GameDelegate) {
         self.delegate = delegate
+        self.info = Game.Info(gameDelegate: delegate)
         if delegate.isHeadless() {
             self.renderer = nil
             self.isHeadless = true
@@ -54,13 +52,9 @@ public final class Game {
     @usableFromInline
     @MainActor internal private(set) lazy var ecs: ECSContext = ECSContext()
     @MainActor public private(set) lazy var hid: HID = HID()
-    public private(set) lazy var resourceManager: ResourceManager = {
-        return ResourceManager(game: self)
-    }()
+    nonisolated public let resourceManager: ResourceManager = ResourceManager()
 
     @MainActor func didFinishLaunching() async {
-        self.state = await platform.loadState(named: "SaveState.json")
-        self.internalState = await platform.loadState(named: "GateEngine.json")
         #if !GATEENGINE_PLATFORM_CREATES_MAINWINDOW
         if isHeadless == false {
             do {

Sources/GateEngine/GameDelegate.swift

@@ -15,12 +15,12 @@ public struct LaunchOptions: OptionSet {
     }
 }
 
+@MainActor
 public protocol GameDelegate: AnyObject {
     /// Return false exit the program
     func shouldFinishLaunching(game: Game) async throws -> Bool
 
     /// Called when the app finishes loading.
-    @MainActor 
     func didFinishLaunching(game: Game, options: LaunchOptions) async
 
     /**
@@ -30,22 +30,18 @@ public protocol GameDelegate: AnyObject {
      - parameter game: The game to create the window from
      - parameter identifier: The identifier to give the window. You must use this identifier.
      */
-    @MainActor 
     func createMainWindow(using manager: WindowManager, with identifier: String) throws -> Window
 
     /// The end user has tried to open a window using the platforms mechanisms
-    @MainActor 
     func createUserRequestedWindow(using manager: WindowManager) throws -> Window?
 
     /**
      A display has been attached.
      - returns: A new window instance to put on the screen. Passing an existing window is undefined behaviour.
     */
-    @MainActor 
     func createWindowForExternalScreen(using manager: WindowManager) throws -> Window?
 
     /// Might be called immediately before the app closes.
-    @MainActor 
     func willTerminate(game: Game)
 
     /**
@@ -59,7 +55,6 @@ public protocol GameDelegate: AnyObject {
      - returns: true if the game doesn't draw anything.
      - note: RenderingSystem(s) do not receive updates in headless mode.
      */
-    @MainActor 
     func isHeadless() -> Bool
 
     /**
@@ -97,13 +92,13 @@ extension GameDelegate {
     public func willTerminate(game: Game) {}
     public func isHeadless() -> Bool { return false }
     public func customResourceLocations() -> [String] { return [] }
-    internal func resolvedCustomResourceLocations() -> [URL] {
+    internal nonisolated func resolvedCustomResourceLocations() -> [URL] {
         return customResourceLocations().compactMap({ URL(string: $0) })
     }
 
-    public func gameIdentifier() -> StaticString? { return nil }
+    public nonisolated func gameIdentifier() -> StaticString? { return nil }
 
-    internal func resolvedGameIdentifier() -> String {
+    internal nonisolated func resolvedGameIdentifier() -> String {
         let charSet = CharacterSet(
             charactersIn: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-."
         )
@@ -159,8 +154,9 @@ extension GameDelegate {
     }
 }
 
+@MainActor
 extension GameDelegate {
-    @MainActor public static func main() async throws {
+    public static func main() async throws {
         let delegate = Self()
         Game._shared = Game(delegate: delegate)
         if try await delegate.shouldFinishLaunching(game: Game.shared) == true {

Sources/GateEngine/GameInfo.swift

@@ -7,7 +7,7 @@
 
 public extension Game {
     struct Info: Sendable {
-        public let identifier: String = Game.unsafeShared.delegate.resolvedGameIdentifier()
+        public let identifier: String
 
         public var executableName: String {
             if let executableName = executableURL?.lastPathComponent {
@@ -28,5 +28,9 @@ public extension Game {
             }
             return nil
         }()
+        
+        init(gameDelegate delegate: any GameDelegate) {
+            self.identifier = delegate.resolvedGameIdentifier()
+        }
     }
 }