Stream player data from Bluemap with realtime timer

Author: alicerunsonfedora

Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -92,6 +92,7 @@ struct CartographyOrnamentMap: View {
                             Marker(
                                 location: pin.position,
                                 title: pin.name,
+                                id: pin.id,
                                 color: pin.color?.swiftUIColor ?? Color.accentColor,
                                 systemImage: pin.icon?.resolveSFSymbol(in: .pin) ?? "mappin"
                             )
@@ -127,6 +128,9 @@ struct CartographyOrnamentMap: View {
             .onReceive(clock.bluemap) { _ in
                 Task { await updateIntegrationData() }
             }
+            .onReceive(clock.realtime) { _ in
+                Task { await updateRealtimeIntegrationData() }
+            }
             .onDisappear {
                 clock.cancelTimers()
             }
@@ -189,6 +193,22 @@ struct CartographyOrnamentMap: View {
             }
         }
     }
+
+    private func updateRealtimeIntegrationData() async {
+        let service = CartographyIntegrationService(serviceType: .bluemap, integrationSettings: file.integrations)
+        do {
+            let result: BluemapResults? = try await service.sync(
+                dimension: viewModel.worldDimension,
+                syncType: .realtime
+            )
+            guard let result else { return }
+            if let currentData = integrationData[.bluemap] as? BluemapResults {
+                integrationData[.bluemap] = result.merged(with: currentData)
+            }
+        } catch {
+            print(error)
+        }
+    }
 }
 
 private struct OrnamentButtonModifier: ViewModifier {

MCMaps/Legacy/Views/CartographyOrnamentMap.swift

@@ -202,10 +202,11 @@ struct RedWindowPinDetailView: View {
             Group {
                 if let world = try? MinecraftWorld(version: "1.21.3", seed: 184_719_632_014) {
                     MinecraftMap(world: world, centerCoordinate: .constant(pin.position)) {
-                        Marker(location: .zero, title: "#nodraw")
+                        Marker(location: .zero, title: "#nodraw", id: "nodraw")
                         Marker(
                             location: pin.position,
                             title: pin.name,
+                            id: pin.id,
                             color: pin.color?.swiftUIColor ?? .accent,
                             systemImage: pin.icon?.resolveSFSymbol(in: .pin) ?? "mappin"
                         )

MCMaps/Red Window/Views/Detail/RedWindowPinDetailView.swift

@@ -77,6 +77,7 @@ struct RedWindowMapView: View {
                             Marker(
                                 location: mapPin.position,
                                 title: mapPin.name,
+                                id: mapPin.id,
                                 color: mapPin.color?.swiftUIColor ?? .accent,
                                 systemImage: mapPin.icon?.resolveSFSymbol(in: .pin) ?? "mappin"
                             )
@@ -98,6 +99,9 @@ struct RedWindowMapView: View {
             .onReceive(clock.bluemap) { _ in
                 Task { await updateIntegrationData() }
             }
+            .onReceive(clock.realtime) { _ in
+                Task { await updateRealtimeIntegrationData() }
+            }
             .onChange(of: env.currentDimension, initial: false) { _, _ in
                 Task { await updateIntegrationData() }
             }
@@ -211,4 +215,20 @@ struct RedWindowMapView: View {
             }
         }
     }
+
+    private func updateRealtimeIntegrationData() async {
+        let service = CartographyIntegrationService(serviceType: .bluemap, integrationSettings: file.integrations)
+        do {
+            let result: BluemapResults? = try await service.sync(
+                dimension: redWindowEnvironment.currentDimension,
+                syncType: .realtime
+            )
+            guard let result else { return }
+            if let currentData = integrationData[.bluemap] as? BluemapResults {
+                integrationData[.bluemap] = result.merged(with: currentData)
+            }
+        } catch {
+            print(error)
+        }
+    }
 }

MCMaps/Red Window/Views/Map/RedWindowMapView.swift

@@ -65,6 +65,7 @@ extension BluemapResults: CartographyIntegrationServiceData {
                         Marker(
                             location: CGPoint(x: annotation.position.x, y: annotation.position.z),
                             title: annotation.label,
+                            id: id,
                             color: .gray,
                             systemImage: "xmark.circle",
                             clusterIdentifier: "bmap-death-marker"
@@ -78,6 +79,7 @@ extension BluemapResults: CartographyIntegrationServiceData {
                     Marker(
                         location: CGPoint(x: annotation.position.x, y: annotation.position.z),
                         title: annotation.label,
+                        id: id,
                         clusterIdentifier: "bmap-server-marker")
                 }
                 annotations.append(contentsOf: mapMarkers)

MCMaps/Shared/Models/Bluemap/BluemapResults.swift

@@ -22,7 +22,7 @@ class CartographyClock {
     /// If the service is disabled or hasn't been set up with ``setupTimer(for:with:)``, this will almost never fire.
     var bluemap: Publishers.Autoconnect<Timer.TimerPublisher>
 
-    private let realtimeTimer = Timer.publish(every: 0.250, on: .main, in: .common)
+    private let realtimeTimer = Timer.publish(every: 0.5, on: .main, in: .common)
     private var bluemapTimer: Timer.TimerPublisher?
     private let stillFrame = Timer.publish(every: .greatestFiniteMagnitude, on: .main, in: .default)