From 29111f74f4c87ed1de973f2c3cfe5068acd22300 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 29 Jun 2026 09:25:56 +0100 Subject: [PATCH] Normalize menu shared document snapshots --- Aetheria.State.Verify/Program.cs | 4 ++-- Assets/Scripts/UI/Menu/InventoryMenu.cs | 8 ++++---- Assets/Scripts/UI/Menu/InventoryPanel.cs | 6 +++--- Assets/Scripts/UI/Menu/TradeMenu.cs | 24 ++++++++++++------------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 13595d256..308c92c64 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -5072,7 +5072,7 @@ static void RequireInventoryShipSettingsUseEveSurface(string root) "AetheriaRuntimeShipSettingsCommandKind.Close", "AetheriaRuntimeShipSettingsSurfaceCommands.ResolveShutdownPerformance(", "ResolveDefaultShutdownPerformance()", - "ResolvePlayerSettings()?.DefaultShutdownPerformance", + "PlayerSettingsSnapshot()?.DefaultShutdownPerformance", "TryReadCurrentEntity(out var currentEntity)", "SetObservedEntityIndex(AetheriaUnityObservedEntityIndex observedEntityIndex)", "private AetheriaRuntimeCurrentEntityDocument _shipSettingsCurrentEntity;", @@ -6304,7 +6304,7 @@ static void RequireTradeItemValuesUseRuntimeQueries(string root) { "TradeItemValue(stock, typedItem)", "TradeItemCommit(", - "ResolveCatalog()?.TradeValueSettings", + "CatalogSnapshot()?.TradeValueSettings", "AetheriaRuntimeDaemonTradeItemQueries.TradeItemValue(", "AetheriaRuntimeTradeItemValue TradeValue", "public int Price => TradeValue.Price", diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs index 508eae007..9d18a0c82 100644 --- a/Assets/Scripts/UI/Menu/InventoryMenu.cs +++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs @@ -1047,7 +1047,7 @@ public class InventoryMenu : MonoBehaviour return _catalog?.Current; } - private AetheriaRuntimePlayerSettingsDocument ResolvePlayerSettings() + private AetheriaRuntimePlayerSettingsDocument PlayerSettingsSnapshot() { if (_playerSettings != null) return _playerSettings.Current; @@ -1067,7 +1067,7 @@ public class InventoryMenu : MonoBehaviour private float ResolveDefaultShutdownPerformance() { - var value = ResolvePlayerSettings()?.DefaultShutdownPerformance ?? 0.25; + var value = PlayerSettingsSnapshot()?.DefaultShutdownPerformance ?? 0.25; return (float)(value <= 0 ? 0.25 : value); } @@ -1078,7 +1078,7 @@ public class InventoryMenu : MonoBehaviour private string FormatValue(float value) { - var settings = ResolvePlayerSettings(); + var settings = PlayerSettingsSnapshot(); var significantDigits = settings?.SignificantDigits ?? 3; var magnitude = value == 0.0f ? 0 : (int)Math.Floor(Math.Log10(Math.Abs(value))) + 1; var digits = significantDigits - magnitude; @@ -1095,7 +1095,7 @@ public class InventoryMenu : MonoBehaviour private string FormatTemperature(float value) { - var unit = ResolvePlayerSettings()?.TemperatureUnit ?? nameof(TemperatureUnit.Celsius); + var unit = PlayerSettingsSnapshot()?.TemperatureUnit ?? nameof(TemperatureUnit.Celsius); if (string.Equals(unit, nameof(TemperatureUnit.Kelvin), StringComparison.OrdinalIgnoreCase)) return $"{FormatValue(value)} K"; if (string.Equals(unit, nameof(TemperatureUnit.Fahrenheit), StringComparison.OrdinalIgnoreCase)) diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 8e1c62762..d46bb2a8d 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -1579,7 +1579,7 @@ private void Update() return _catalog?.Current; } - private AetheriaRuntimePlayerSettingsDocument ResolvePlayerSettings() + private AetheriaRuntimePlayerSettingsDocument PlayerSettingsSnapshot() { if (_playerSettings != null) return _playerSettings.Current; @@ -1599,7 +1599,7 @@ private void Update() private string FormatValue(float value) { - var settings = ResolvePlayerSettings(); + var settings = PlayerSettingsSnapshot(); var significantDigits = settings?.SignificantDigits ?? 3; var magnitude = value == 0.0f ? 0 : (int)Math.Floor(Math.Log10(Math.Abs(value))) + 1; var digits = significantDigits - magnitude; @@ -1616,7 +1616,7 @@ private void Update() private string FormatTemperature(float value) { - var unit = ResolvePlayerSettings()?.TemperatureUnit ?? nameof(TemperatureUnit.Celsius); + var unit = PlayerSettingsSnapshot()?.TemperatureUnit ?? nameof(TemperatureUnit.Celsius); if (string.Equals(unit, nameof(TemperatureUnit.Kelvin), StringComparison.OrdinalIgnoreCase)) return $"{FormatValue(value)} K"; if (string.Equals(unit, nameof(TemperatureUnit.Fahrenheit), StringComparison.OrdinalIgnoreCase)) diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 2431e5cbc..dac89a09e 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -239,7 +239,7 @@ public class TradeMenu : MonoBehaviour private IEnumerable BuildStationStockRows() { - return (ResolveStationRefit()?.StationStock ?? Array.Empty()) + return (StationRefitSnapshot()?.StationStock ?? Array.Empty()) .Select(stock => { var typedItem = FindTypedTradeItem(stock.ItemKey); @@ -285,7 +285,7 @@ public class TradeMenu : MonoBehaviour private AetheriaRuntimeCatalogItem FindTypedTradeItem(string itemKey) { - return ResolveCatalog()?.FindItem(itemKey ?? ""); + return CatalogSnapshot()?.FindItem(itemKey ?? ""); } private AetheriaRuntimeTradeItemValue TradeItemValue( @@ -295,7 +295,7 @@ public class TradeMenu : MonoBehaviour return AetheriaRuntimeDaemonTradeItemQueries.TradeItemValue( typedItem, TradeItemCommit(stock), - ResolveCatalog()?.TradeValueSettings); + CatalogSnapshot()?.TradeValueSettings); } private static AetheriaRuntimeLoadoutItemCommit? TradeItemCommit(AetheriaRuntimeStationStockItem stock) @@ -403,7 +403,7 @@ public class TradeMenu : MonoBehaviour { if (CreditsLabel != null) { - CreditsLabel.text = ResolveStationRefit()?.Credits.ToString("N0") ?? "0"; + CreditsLabel.text = StationRefitSnapshot()?.Credits.ToString("N0") ?? "0"; } } @@ -443,7 +443,7 @@ public class TradeMenu : MonoBehaviour if (totalPrice > int.MaxValue) return; - var stationRefit = ResolveStationRefit(); + var stationRefit = StationRefitSnapshot(); var stationEntityKey = stationRefit?.DockParentEntityKey ?? ""; var stationCargoIndex = row.Stock.CargoBayIndex; var sourcePosition = new int2(row.Stock.X, row.Stock.Y); @@ -510,7 +510,7 @@ public class TradeMenu : MonoBehaviour return true; } - private AetheriaRuntimeStationRefitDocument ResolveStationRefit() + private AetheriaRuntimeStationRefitDocument StationRefitSnapshot() { if (_stationRefit != null) return _stationRefit.Current; @@ -609,7 +609,7 @@ public class TradeMenu : MonoBehaviour _stationRefit = null; } - private AetheriaRuntimeCatalogSnapshot ResolveCatalog() + private AetheriaRuntimeCatalogSnapshot CatalogSnapshot() { if (_catalog != null) return _catalog.Current; @@ -627,7 +627,7 @@ public class TradeMenu : MonoBehaviour return _catalog?.Current; } - private AetheriaRuntimePlayerSettingsDocument ResolvePlayerSettings() + private AetheriaRuntimePlayerSettingsDocument PlayerSettingsSnapshot() { if (_playerSettings != null) return _playerSettings.Current; @@ -647,12 +647,12 @@ public class TradeMenu : MonoBehaviour private string ResolveManufacturerName(AetheriaRuntimeCatalogItem item) { - return ResolveCatalog()?.GetManufacturer(item)?.Name ?? "GameCult"; + return CatalogSnapshot()?.GetManufacturer(item)?.Name ?? "GameCult"; } private string FormatValue(float value) { - var settings = ResolvePlayerSettings(); + var settings = PlayerSettingsSnapshot(); var significantDigits = settings?.SignificantDigits ?? 3; var magnitude = value == 0.0f ? 0 : (int)Math.Floor(Math.Log10(Math.Abs(value))) + 1; var digits = significantDigits - magnitude; @@ -669,7 +669,7 @@ public class TradeMenu : MonoBehaviour private string FormatTemperature(float value) { - var unit = ResolvePlayerSettings()?.TemperatureUnit ?? nameof(TemperatureUnit.Celsius); + var unit = PlayerSettingsSnapshot()?.TemperatureUnit ?? nameof(TemperatureUnit.Celsius); if (string.Equals(unit, nameof(TemperatureUnit.Kelvin), StringComparison.OrdinalIgnoreCase)) return $"{FormatValue(value)} K"; if (string.Equals(unit, nameof(TemperatureUnit.Fahrenheit), StringComparison.OrdinalIgnoreCase)) @@ -1193,7 +1193,7 @@ public class TradeMenu : MonoBehaviour private AetheriaRuntimeTradeCargoSelectorSurfaceModel BuildTradeCargoSelectorSurfaceModel() { var targets = new List(); - var stationRefit = ResolveStationRefit(); + var stationRefit = StationRefitSnapshot(); if (stationRefit?.IsDocked == true && !string.IsNullOrWhiteSpace(stationRefit.DockParentEntityKey) && stationRefit.DockingBayIndex >= 0)