From a40015eb9d23ea3dc69b18fa8cefcda827fca701 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 12 Jul 2026 12:52:44 +0100 Subject: [PATCH] Make Aetheria witness import owned state --- ReleaseConsumerProject/Packages/manifest.json | 6 ++--- .../Packages/packages-lock.json | 26 ++++++++++++------- scripts/run-aetheria-daemon-world-witness.ps1 | 12 ++++++++- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/ReleaseConsumerProject/Packages/manifest.json b/ReleaseConsumerProject/Packages/manifest.json index c80d56b..d8b049c 100644 --- a/ReleaseConsumerProject/Packages/manifest.json +++ b/ReleaseConsumerProject/Packages/manifest.json @@ -5,10 +5,10 @@ "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.physics": "1.0.0", "com.unity.modules.uielements": "1.0.0", - "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-source-v1.0.3-r2", + "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.4", "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.1.1", - "org.gamecult.eve.surface": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#eveunity-surface-v0.1.0", - "org.gamecult.eve.unity-scene": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.1.4", + "org.gamecult.eve.surface": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#b81e2d149b0d5c562463d5c30476cd1ef48f49cd", + "org.gamecult.eve.unity-scene": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#b81e2d149b0d5c562463d5c30476cd1ef48f49cd", "org.gamecult.eve.unity-uitoolkit": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-uitoolkit#eveunity-uitoolkit-v0.1.0" }, "testables": [ diff --git a/ReleaseConsumerProject/Packages/packages-lock.json b/ReleaseConsumerProject/Packages/packages-lock.json index 4aef59c..d99dea9 100644 --- a/ReleaseConsumerProject/Packages/packages-lock.json +++ b/ReleaseConsumerProject/Packages/packages-lock.json @@ -6,6 +6,13 @@ "source": "builtin", "dependencies": {} }, + "com.unity.mathematics": { + "version": "1.3.3", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.6.0", "depth": 0, @@ -17,11 +24,11 @@ } }, "org.gamecult.cultlib": { - "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-source-v1.0.3-r2", + "version": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.4", "depth": 0, "source": "git", "dependencies": {}, - "hash": "3a74e01d92f3e357205200edcba8f8a1c1b2dae1" + "hash": "f1179d11dc334843b27aecbb73bc7329f183003a" }, "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.1.1", @@ -31,24 +38,25 @@ "hash": "0b099274a4e2b4c301eced4322166837792f585a" }, "org.gamecult.eve.surface": { - "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#eveunity-surface-v0.1.0", + "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#b81e2d149b0d5c562463d5c30476cd1ef48f49cd", "depth": 0, "source": "git", "dependencies": { - "org.gamecult.cultlib": "1.0.3" + "org.gamecult.cultlib": "1.0.4" }, - "hash": "e10821f1cc81f619479c6507438f6a097d1f0ce2" + "hash": "b81e2d149b0d5c562463d5c30476cd1ef48f49cd" }, "org.gamecult.eve.unity-scene": { - "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.1.4", + "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#b81e2d149b0d5c562463d5c30476cd1ef48f49cd", "depth": 0, "source": "git", "dependencies": { - "org.gamecult.cultlib": "1.0.3", + "org.gamecult.cultlib": "1.0.4", "org.gamecult.eve.plugin-fields": "0.1.1", - "org.gamecult.eve.surface": "0.1.0" + "org.gamecult.eve.surface": "0.1.0", + "com.unity.mathematics": "1.3.2" }, - "hash": "093eb80d6c2a6da216b9e6b3fb921494e427102c" + "hash": "b81e2d149b0d5c562463d5c30476cd1ef48f49cd" }, "org.gamecult.eve.unity-uitoolkit": { "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-uitoolkit#eveunity-uitoolkit-v0.1.0", diff --git a/scripts/run-aetheria-daemon-world-witness.ps1 b/scripts/run-aetheria-daemon-world-witness.ps1 index c53caa8..cac2c3c 100644 --- a/scripts/run-aetheria-daemon-world-witness.ps1 +++ b/scripts/run-aetheria-daemon-world-witness.ps1 @@ -24,8 +24,9 @@ $replicaPath = Join-Path $outputRoot "eve-unity-replica.cc" $assetCachePath = Join-Path $outputRoot "asset-cache" $statePath = Join-Path $outputRoot "aetheria-witness-state.cc" $daemonProject = Join-Path $AetheriaRoot "Aetheria.State.Daemon\Aetheria.State.Daemon.csproj" +$importProject = Join-Path $AetheriaRoot "Aetheria.State.Import\Aetheria.State.Import.csproj" -foreach ($required in @($UnityExe, (Join-Path $repoRoot $projectRoot), $daemonProject)) { +foreach ($required in @($UnityExe, (Join-Path $repoRoot $projectRoot), $daemonProject, $importProject)) { if (-not (Test-Path -LiteralPath $required)) { throw "Required world witness path not found: $required" } } @@ -53,6 +54,15 @@ foreach ($ephemeralPath in @( } if (Test-Path -LiteralPath $resolved) { Remove-Item -LiteralPath $resolved -Recurse -Force } } + +$import = Start-Process -FilePath "dotnet" -ArgumentList @( + "run", "--project", $importProject, "--", $AetheriaRoot, $statePath +) -PassThru -WindowStyle Hidden -Wait ` + -RedirectStandardOutput (Join-Path $outputRoot "aetheria-import.log") ` + -RedirectStandardError (Join-Path $outputRoot "aetheria-import.error.log") +if ($import.ExitCode -ne 0) { + throw "Aetheria state import failed with exit code $($import.ExitCode). See $outputRoot\aetheria-import.error.log" +} if (-not $SkipAssetBundleBuild) { $bundleBuilder = Start-Process -FilePath $UnityExe -ArgumentList @( "-batchmode", "-quit", "-projectPath", ".",