From bfcf1e8aa0d5fec52e50b6c35733199b4e0dcc05 Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Mon, 6 Jul 2026 02:00:46 +0100
Subject: [PATCH] Remove legacy body key prefixes

---
 Aetheria.State.Smoke/Program.cs     | 9 +++++----
 Aetheria.State.Verify/Program.cs    | 5 +++--
 Assets/Scripts/ServerShared/Zone.cs | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Aetheria.State.Smoke/Program.cs b/Aetheria.State.Smoke/Program.cs
index c04050401..1230f5768 100644
--- a/Aetheria.State.Smoke/Program.cs
+++ b/Aetheria.State.Smoke/Program.cs
@@ -4,6 +4,7 @@ using Aetheria.State.Migration;
 using GameCult.Caching;
 using GameCult.Aetheria.State.Verse;
 using GameCult.Mesh;
+using EveSurfaceDocument = GameCult.Eve.Surface.EveSurfaceDocument;
 
 var root = args.Length > 0 ? args[0] : Directory.GetCurrentDirectory();
 var stateDirectory = Path.Combine(Path.GetTempPath(), "aetheria-state-smoke", Guid.NewGuid().ToString("N"));
@@ -322,7 +323,7 @@ await using (var node = await AetheriaStateNode.OpenAsync(statePath, "aetheria-s
                 OwnerIndex = 0,
                 BehaviorIndex = 1,
                 BehaviorKind = "ResourceScanner",
-                ResourceScannerTargetBodyKey = "aetheria.body:legacy:smoke:body",
+                ResourceScannerTargetBodyKey = "aetheria.body:smoke:body",
                 ResourceScannerAsteroidIndex = 2,
                 ResourceScannerScanTime = 1.25,
                 ResourceScannerRange = 500.0,
@@ -335,7 +336,7 @@ await using (var node = await AetheriaStateNode.OpenAsync(statePath, "aetheria-s
                 OwnerIndex = 0,
                 BehaviorIndex = 2,
                 BehaviorKind = "MiningTool",
-                MiningToolAsteroidBeltKey = "aetheria.body:legacy:smoke:body",
+                MiningToolAsteroidBeltKey = "aetheria.body:smoke:body",
                 MiningToolAsteroidIndex = 3,
                 MiningToolRange = 275.0
             },
@@ -852,12 +853,12 @@ await using (var reopened = await AetheriaStateNode.OpenAsync(statePath, "aether
         entitySnapshot.BehaviorStates[0].AetherDriveRpmY != 900.0 ||
         entitySnapshot.BehaviorStates[0].AetherDriveMaximumRpm != 2400.0 ||
         entitySnapshot.BehaviorStates[1].BehaviorKind != "ResourceScanner" ||
-        entitySnapshot.BehaviorStates[1].ResourceScannerTargetBodyKey != "aetheria.body:legacy:smoke:body" ||
+        entitySnapshot.BehaviorStates[1].ResourceScannerTargetBodyKey != "aetheria.body:smoke:body" ||
         entitySnapshot.BehaviorStates[1].ResourceScannerAsteroidIndex != 2 ||
         entitySnapshot.BehaviorStates[1].ResourceScannerScanTime != 1.25 ||
         entitySnapshot.BehaviorStates[1].ResourceScannerScanDuration != 3.5 ||
         entitySnapshot.BehaviorStates[2].BehaviorKind != "MiningTool" ||
-        entitySnapshot.BehaviorStates[2].MiningToolAsteroidBeltKey != "aetheria.body:legacy:smoke:body" ||
+        entitySnapshot.BehaviorStates[2].MiningToolAsteroidBeltKey != "aetheria.body:smoke:body" ||
         entitySnapshot.BehaviorStates[2].MiningToolAsteroidIndex != 3 ||
         entitySnapshot.BehaviorStates[2].MiningToolRange != 275.0 ||
         entitySnapshot.BehaviorStates[3].BehaviorKind != "Thruster" ||
diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs
index 2f1d99e78..ed5ea2343 100644
--- a/Aetheria.State.Verify/Program.cs
+++ b/Aetheria.State.Verify/Program.cs
@@ -1216,6 +1216,7 @@ static void RequireTypedBehaviorBodyKeys(string root)
         Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeCatalogSnapshot.cs"),
         Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeCatalogStore.cs"),
         Path.Combine(root, "Assets", "Scripts", "Gameplay", "ActionGameManager.cs"),
+        Path.Combine(root, "Assets", "Scripts", "ServerShared", "Zone.cs"),
         Path.Combine(root, "Aetheria.State.Smoke", "Program.cs"),
         Path.Combine(root, "Aetheria.State.Unity.Smoke", "Program.cs")
     };
@@ -1229,8 +1230,8 @@ static void RequireTypedBehaviorBodyKeys(string root)
         "ParseBodyGuidFromKey(",
         "private static string OrbitKey(Guid",
         "private static string BodyKey(Guid",
-        "$\"aetheria.orbit:legacy:",
-        "$\"aetheria.body:legacy:",
+        "aetheria.orbit:legacy:",
+        "aetheria.body:legacy:",
         "public Guid ScanTarget",
         "public Guid AsteroidBelt",
         "RestoreRuntimeState(Guid scanTarget",
diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs
index 882ac0722..b2b138859 100644
--- a/Assets/Scripts/ServerShared/Zone.cs
+++ b/Assets/Scripts/ServerShared/Zone.cs
@@ -18,8 +18,8 @@ using Random = Unity.Mathematics.Random;
 
 public class Zone
 {
-    public const string OrbitKeyPrefix = "aetheria.orbit:legacy:";
-    public const string BodyKeyPrefix = "aetheria.body:legacy:";
+    public const string OrbitKeyPrefix = "aetheria.orbit:";
+    public const string BodyKeyPrefix = "aetheria.body:";
 
     public Action<string> Log;
     public ReactiveCollection<Entity> Entities = new ReactiveCollection<Entity>();