From f6ec7c223be83551b7a0cba3770993f91cd5a47b Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 19 Jul 2026 01:05:56 +0100 Subject: [PATCH] Consume released CultLib 1.0.19 --- .../Assets/Editor/AetheriaDaemonDevelopmentWindow.cs | 2 +- Aetheria.Unity/Packages/manifest.json | 2 +- Aetheria.Unity/Packages/packages-lock.json | 4 ++-- Packages/manifest.json | 2 +- docs/unity-daemon-development.md | 8 +++++--- scripts/verify-aetheria-unity-client.ps1 | 10 +++++----- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Aetheria.Unity/Assets/Editor/AetheriaDaemonDevelopmentWindow.cs b/Aetheria.Unity/Assets/Editor/AetheriaDaemonDevelopmentWindow.cs index 52ddf9ab2..9e5a8a20f 100644 --- a/Aetheria.Unity/Assets/Editor/AetheriaDaemonDevelopmentWindow.cs +++ b/Aetheria.Unity/Assets/Editor/AetheriaDaemonDevelopmentWindow.cs @@ -214,7 +214,7 @@ namespace Aetheria.Editor public static string Endpoint => $"rudp://127.0.0.1:{Port}"; public static string ProcessIdText => IsRunning ? _daemon.Id.ToString(CultureInfo.InvariantCulture) : "-"; public static string StatePath => Path.Combine(ProjectRoot, "Aetheria.Unity", "Build", "aetheria-unity-dev.cc"); - public static string CultLibRoot => ResolveSibling("CultLib-codex-cultmesh-reliability", "CultLib"); + public static string CultLibRoot => ResolveSibling("CultLib-release", "CultLib"); public static string YmirRoot => ResolveSibling("Ymir-aetheria-integration", "Ymir"); public static string EveUnityRoot => ResolveSibling("EveUnity"); private static int Port => EditorPrefs.GetInt(PortPreference, 3076); diff --git a/Aetheria.Unity/Packages/manifest.json b/Aetheria.Unity/Packages/manifest.json index cea16c434..62756413a 100644 --- a/Aetheria.Unity/Packages/manifest.json +++ b/Aetheria.Unity/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.modules.physics": "1.0.0", "com.unity.modules.uielements": "1.0.0", "com.unity.render-pipelines.universal": "17.4.0", - "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.18", + "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.19", "org.gamecult.eve.plugin-fields": "https://github.com/GameCult/EvePlugins.git?path=/plugins/eve-plugin-fields/unity/org.gamecult.eve.plugin-fields#eve-plugin-fields-unity-v0.2.3", "org.gamecult.eve.surface": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#eveunity-surface-v0.2.4", "org.gamecult.eve.unity-scene": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.72" diff --git a/Aetheria.Unity/Packages/packages-lock.json b/Aetheria.Unity/Packages/packages-lock.json index c8a3f86a0..326b179a2 100644 --- a/Aetheria.Unity/Packages/packages-lock.json +++ b/Aetheria.Unity/Packages/packages-lock.json @@ -127,11 +127,11 @@ } }, "org.gamecult.cultlib": { - "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.18", + "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.19", "depth": 0, "source": "git", "dependencies": {}, - "hash": "49c43baa4c80b3bf8f5febae40baf99e1f2a0262" + "hash": "693df0901d75cfd8e3a0a5225e270011eeddb0be" }, "org.gamecult.eve.plugin-fields": { "version": "https://github.com/GameCult/EvePlugins.git?path=/plugins/eve-plugin-fields/unity/org.gamecult.eve.plugin-fields#eve-plugin-fields-unity-v0.2.3", diff --git a/Packages/manifest.json b/Packages/manifest.json index 2a9d92d99..f239206e6 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -21,7 +21,7 @@ "org.gamecult.aetheria.eve-runtime": "file:org.gamecult.aetheria.eve-runtime", "org.gamecult.aetheria.state": "file:org.gamecult.aetheria.state", "org.gamecult.cultmath": "file:../../CultMath", - "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.18", + "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.19", "org.gamecult.eve.surface": "file:../../EveUnity/packages/org.gamecult.eve.surface", "org.gamecult.eve.plugin-fields": "https://github.com/GameCult/EvePlugins.git?path=/plugins/eve-plugin-fields/unity/org.gamecult.eve.plugin-fields#eve-plugin-fields-unity-v0.2.3", "org.gamecult.eve.unity-scene": "file:../../EveUnity/packages/org.gamecult.eve.unity-scene", diff --git a/docs/unity-daemon-development.md b/docs/unity-daemon-development.md index 8bfdbb520..9cdba3736 100644 --- a/docs/unity-daemon-development.md +++ b/docs/unity-daemon-development.md @@ -11,9 +11,11 @@ client to connect directly to the daemon's local CultMesh endpoint. Odin is not part of this path. The launcher displays and passes the exact source dependency roots used for the -Debug daemon build. It prefers the active `CultLib-codex-cultmesh-reliability` -and `Ymir-aetheria-integration` sibling checkouts, falling back to canonical -`CultLib` and `Ymir` siblings only when those active integration checkouts are +Debug daemon build. CultLib prefers the exact released `CultLib-release` +sibling and falls back to the canonical `CultLib` sibling for checkouts that +do not maintain a separate release worktree. +Ymir still prefers the active `Ymir-aetheria-integration` sibling checkout and +falls back to the canonical `Ymir` sibling when that integration checkout is absent. This prevents an older sibling assembly from impersonating the daemon being debugged. diff --git a/scripts/verify-aetheria-unity-client.ps1 b/scripts/verify-aetheria-unity-client.ps1 index 73975ba05..edb6fa468 100644 --- a/scripts/verify-aetheria-unity-client.ps1 +++ b/scripts/verify-aetheria-unity-client.ps1 @@ -14,8 +14,8 @@ $manifest = Get-Content (Join-Path $ProjectPath "Packages/manifest.json") -Raw | $lock = Get-Content (Join-Path $ProjectPath "Packages/packages-lock.json") -Raw | ConvertFrom-Json $expected = @{ "org.gamecult.cultlib" = @( - "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.18", - "49c43baa4c80b3bf8f5febae40baf99e1f2a0262") + "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.19", + "693df0901d75cfd8e3a0a5225e270011eeddb0be") "org.gamecult.eve.surface" = @( "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#eveunity-surface-v0.2.4", "e08fa08335f99e9edddeb706912eecfad07cb281") @@ -34,7 +34,7 @@ foreach ($packageName in $expected.Keys) { $cultLibPackage = Get-ChildItem (Join-Path $ProjectPath "Library/PackageCache") -Directory | Where-Object Name -Like "org.gamecult.cultlib@*" | - Where-Object { (Get-Content (Join-Path $_.FullName "package.json") -Raw | ConvertFrom-Json).version -eq "1.0.17" } | + Where-Object { (Get-Content (Join-Path $_.FullName "package.json") -Raw | ConvertFrom-Json).version -eq "1.0.19" } | Select-Object -First 1 if (-not $cultLibPackage) { throw "Resolved CultLib package is missing from Library/PackageCache." } @@ -68,9 +68,9 @@ foreach ($requiredInputContract in @("PayloadKeys", "CurrentValue", "ActionBar", $scenePackage = Get-ChildItem (Join-Path $ProjectPath "Library/PackageCache") -Directory | Where-Object Name -Like "org.gamecult.eve.unity-scene@*" | - Where-Object { (Get-Content (Join-Path $_.FullName "package.json") -Raw | ConvertFrom-Json).version -eq "0.3.70" } | + Where-Object { (Get-Content (Join-Path $_.FullName "package.json") -Raw | ConvertFrom-Json).version -eq "0.3.72" } | Select-Object -First 1 -if (-not $scenePackage) { throw "Resolved Eve Unity scene 0.3.70 package is missing from Library/PackageCache." } +if (-not $scenePackage) { throw "Resolved Eve Unity scene 0.3.72 package is missing from Library/PackageCache." } $advertisedInputSource = Get-Content (Join-Path $scenePackage.FullName "Runtime/EveUnityAdvertisedInputAction.cs") -Raw $inputDriverSource = Get-Content (Join-Path $scenePackage.FullName "Runtime/EveUnityPlayableWorldInputDriver.cs") -Raw $actionBarSource = Get-Content (Join-Path $scenePackage.FullName "Runtime/EveUnityInputActionBar.cs") -Raw