From dea31eed1b4479863c84b8d8d2e957aa084fef1c Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Sun, 28 Jun 2026 03:24:07 +0100
Subject: [PATCH] Remove facade wording from inventory docking helpers

---
 Aetheria.State.Verify/Program.cs         | 6 +++++-
 Assets/Scripts/UI/Menu/InventoryMenu.cs  | 6 +++---
 Assets/Scripts/UI/Menu/InventoryPanel.cs | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs
index 9484134e9..721d424b2 100644
--- a/Aetheria.State.Verify/Program.cs
+++ b/Aetheria.State.Verify/Program.cs
@@ -6229,22 +6229,26 @@ static void RequireInventoryDropdownUseEveSurface(string root)
         !source.Contains("TryResolveStationRefitEntity(selection.EntityKey", StringComparison.Ordinal) ||
         !source.Contains("TryResolveCurrentDockingBayRow(out var currentDockingBay)", StringComparison.Ordinal) ||
         !source.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) ||
+        !source.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) ||
         !source.Contains("dockingIndex.TryResolveCurrentDockingBayRow(out dockingBay)", StringComparison.Ordinal) ||
         !source.Contains("currentDockingBay.DockingBayIndex", StringComparison.Ordinal) ||
         !source.Contains("ResolveStationRefit()?.DockParentEntityKey", StringComparison.Ordinal) ||
         source.Contains("var hasDockingBay = TryGetTypedCurrentDockingBayFacade", StringComparison.Ordinal) ||
+        source.Contains("TryResolveCurrentDockingBayFacade", StringComparison.Ordinal) ||
         source.Contains("ResolveDockingState()?.CurrentDocking", StringComparison.Ordinal))
     {
         throw new InvalidOperationException(
             "InventoryPanel dropdown must carry typed entity identity through the shared Eve surface and must project docking display state from StationRefitAsync docking-bay rows.");
     }
 
-    if (!inventoryMenu.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) ||
+    if (!inventoryMenu.Contains("TryResolveCurrentEntity(out var currentEntity)", StringComparison.Ordinal) ||
+        !inventoryMenu.Contains("TryResolveCurrentDockingBay(out var dockingBay)", StringComparison.Ordinal) ||
         !inventoryMenu.Contains(".DockingState", StringComparison.Ordinal) ||
         !inventoryMenu.Contains(".Latest()", StringComparison.Ordinal) ||
         !inventoryMenu.Contains("TryResolveObservedDockingIndex(out var dockingIndex)", StringComparison.Ordinal) ||
         !inventoryMenu.Contains("dockingIndex.TryResolveCurrentDockingBay(out var resolvedDockingBay)", StringComparison.Ordinal) ||
         inventoryMenu.Contains("TryGetTypedCurrentDockingBayFacade", StringComparison.Ordinal) ||
+        inventoryMenu.Contains("TryResolveCurrentEntityFacade", StringComparison.Ordinal) ||
         inventoryMenu.Contains("ResolveDockingState()?.CurrentDocking", StringComparison.Ordinal) ||
         inventoryMenu.Contains("_observedFacadeIndex.TryResolveDockingBayByRecordKey", StringComparison.Ordinal) ||
         inventoryMenu.Contains("GameManager.TryGetObservedDockingBay(", StringComparison.Ordinal) ||
diff --git a/Assets/Scripts/UI/Menu/InventoryMenu.cs b/Assets/Scripts/UI/Menu/InventoryMenu.cs
index 8d407a0c0..2448ba0ce 100644
--- a/Assets/Scripts/UI/Menu/InventoryMenu.cs
+++ b/Assets/Scripts/UI/Menu/InventoryMenu.cs
@@ -87,14 +87,14 @@ public class InventoryMenu : MonoBehaviour
         // {
         //     _destroyItem = false;
         // });
-        var hasObservedCurrentEntity = TryResolveCurrentEntityFacade(out var currentEntity);
+        var hasCurrentEntity = TryResolveCurrentEntity(out var currentEntity);
         var cargo = TryResolveCurrentDockingBay(out var dockingBay)
             ? dockingBay
             : currentEntity?.CargoBays.FirstOrDefault();
         if (cargo!=null)
             InventoryPanels[0].Display(cargo);
         else InventoryPanels[0].Clear();
-        if(hasObservedCurrentEntity)
+        if(hasCurrentEntity)
             InventoryPanels[1].Display(currentEntity);
         else InventoryPanels[1].Clear();
     }
@@ -760,7 +760,7 @@ public class InventoryMenu : MonoBehaviour
         return ResolveDockingState()?.StationRefit;
     }
 
-    private bool TryResolveCurrentEntityFacade(out Entity currentEntity)
+    private bool TryResolveCurrentEntity(out Entity currentEntity)
     {
         currentEntity = null;
         return TryResolveObservedDockingIndex(out var dockingIndex) &&
diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs
index 698fd0467..96453379b 100644
--- a/Assets/Scripts/UI/Menu/InventoryPanel.cs
+++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs
@@ -258,7 +258,7 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
                 }
                 return;
             case AetheriaRuntimeInventoryDropdownSelectionKind.DockingBay:
-                if (TryResolveCurrentDockingBayFacade(out var dockingBay))
+                if (TryResolveCurrentDockingBay(out var dockingBay))
                 {
                     Display(dockingBay);
                 }
@@ -1141,7 +1141,7 @@ private void Update()
                dockingIndex.TryResolveCurrentDockingBayRow(out dockingBay);
     }
 
-    private bool TryResolveCurrentDockingBayFacade(out EquippedCargoBay dockingBay)
+    private bool TryResolveCurrentDockingBay(out EquippedCargoBay dockingBay)
     {
         dockingBay = null;
         if (!TryResolveObservedDockingIndex(out var dockingIndex) ||