From 181a0d0a79a148c38d14c9cb73a7eca1e533e775 Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Sat, 13 Jun 2026 14:44:55 +0100
Subject: [PATCH] Demote DatabaseEntry serialization metadata

---
 .voidbot/state/aetheria.cc                    | Bin 32794 -> 32942 bytes
 .../ServerShared/CultCache/DatabaseEntry.cs   |  43 ------------------
 docs/aetheria-perfect-machine-map.md          |  20 +++++---
 3 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc
index 2d855ab63909b49052e649f9121b0e359bc1cd36..0f07ebe8c5701e8fca38ef184890656ccc869cc9 100644
GIT binary patch
delta 1113
zcmZ`(T}u>E7;aY+l}sTm(9C0?5zWr3yM8Tx<p&|IuELri6r7oPcXxDV&T`HfY3Zhq
z%eskk*IiV2XUSZ3QxS9}gttaNA&CA#XJ&Rbw~vc~;W_WT&-1+JdFT0q_`$>Y+x>V;
zI+IGNqoc#y&thHTbNp!pOauUFxL*av!iwg`-gudL*BVQGec46Kv4$BeIh<Ayb_^6D
zS<~4Scc!{U_C}k^O1KP6eXU#Aw7<r>qN4CKhaihMMW9H>l$s#sHanLHt+fiPT*o91
zvVmhmk}7|ZP332jQD2{YUdj^ZGQB{w9ng7l7b;1!=nx7Bb52do<x&#Lm!N_u*w}PX
zS;}(|bscWnfJ_7A3lDAaN*N4fa<Gvlo1+p~WuOdc#FeHw5win5W9mK!he??yhs(0k
zR};vbhZ5d12@Qb7d=AMuFa``UZd#T&%v?}>b@dLB20C^bAYKBbyOc^bD3BpKvYjLH
zgvle!Ya@{=q!G<EEdvqxXjN7e4uFZ{fzH+sYjBUtcASZ+!9p(bY7+x2#ix?~!6tiv
zR)H~GgmtX%{-!8UVxu~5H5TcMdG7`%n-(@#aanfJ2{qUsmuSe|+`mUZD&f>kr&#Nl
zjJkQ#iJ>dEX4n6DA<4QMzy&Uob6RagqCS2}p>Q%IeopjzM=K~6OL*V2`Nr6!xVdrl
zVicAzUeQOMyYc>PY)+)NuK%xsY<+20!rlY4Snp8PS)CR?YD~Pi-7^Vm<n&1{NTq@{
z{a7n#1u6<!4&u2Awgyx|asyl@rz2YLUhb$9D@jBfQ^gT)y_Cuir!whqhf^cluQ)EU
zZ)X;~Cq<*7{lKX1XF`UDR=giO=UbYiT5;UaU0v<*p<vgi`Ns%ISC_v@^t<H<91p-Z
U?xQL&5&RLn+}@{_2uW}M0tgR@0RR91

delta 1086
zcmZvczfTlF6vw>-6$%whltiLFf5!w40s`W%M4=D`f1W==VllV-Zg;%dna#}X;c0<N
zVPj*q!^T97iG@nGHO81&tA&NeXkqW);M=`DFu`u;yR+YU-_LuqukIBW?-t*@D0U7W
z86GMfJ~TM{sIVpeSbW$LMl(UR-N}WKp-kv#-(FO|k^}Aj&a0=dNNyYbhPwz(WULBc
z2904JUSLiQG#Vx9sDVirs!9jUT3Q(uX$N7B8E{dcMYr_a5sU}l3tLZCEyi8dE%V?o
z%Y^c1i$Tqq;J2CON@kyF3{)N6KDdM)H{^LKKdBF9nDtjy<wl4rtF#R3BV<(rRpSp>
z+OWDbpN+X76$oCZU`&WS14(o=<C04cSY&;rDSrvdWa<f3VIsaz?ulPkH*sI78gK)i
zl5~J3GAE5eYX&YmnupeuURacd0)6}ZFES#ec_p%Fz*sIsejZS8C0v*+p9exkP6jII
zu*hKib8j!vinK;)MFU7O5J_?#s9^&Fw9F-xU=@T~-9*Pi8roe3TtT1JxzZ4_hEU8k
zz$I-?L0Jq!rI~KP6g^I+HmZ_Y1d3W$T4GMxld1V26r38C#`!v_2%V+E$wn(TqE<KA
z{C_rd)<WHEE)5CjNLn6Xld8m97Q#q-2*y_tA<!5KMxOsr>yQ8JJJT}}2|K|YDm!<8
ztjOfS{_%BtZp^TdK6R9)eA(1dt)Qw|%;xCE^V7W>(h*s1anja5xa0Upn!CabPIFlU
z4<(JG1CEl$Y8nL#l4-5xh$vBOaVjl5)mZ&@B3?SWD|vht3WdJp?R2@lFcNoP+`T!4
zyL>ycc*)eocWVpB;*M(vx2=Ag+ntNMukVka=yl1RYm1xW58m<a=ItFCoPB1QXMU_X
zm2~-TTe48w*ttG`7k_H&&F}E&aCV2k*!L}AEE8Tw^;{Th{s$)N_gg~tA4q=JKXkT~
G@!7w935I_F

diff --git a/Assets/Scripts/ServerShared/CultCache/DatabaseEntry.cs b/Assets/Scripts/ServerShared/CultCache/DatabaseEntry.cs
index 41d6f51f2..fbbd0bb84 100644
--- a/Assets/Scripts/ServerShared/CultCache/DatabaseEntry.cs
+++ b/Assets/Scripts/ServerShared/CultCache/DatabaseEntry.cs
@@ -3,53 +3,15 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 using System;
-using System.Linq;
-using MessagePack;
-using MessagePack.Formatters;
-// TODO: USE THIS EVERYWHERE
 using Unity.Mathematics;
-using static Unity.Mathematics.math;
 
 public interface INamedEntry
 {
     string EntryName { get; set; }
 }
 
-[MessagePackObject,
- Union(0, typeof(SimpleCommodityData)),
- Union(1, typeof(CompoundCommodityData)),
- Union(2, typeof(GearData)),
- Union(3, typeof(HullData)),
- Union(4, typeof(SimpleCommodity)),
- Union(5, typeof(CompoundCommodity)),
- Union(6, typeof(EquippableItem)),
- Union(8, typeof(GalaxyMapLayerData)),
- Union(9, typeof(NameFile)),
- //Union(10, typeof(ZoneData)),
- Union(11, typeof(PlayerData)),
- // Union(12, typeof(Corporation)),
- Union(13, typeof(Faction)),
- Union(14, typeof(OrbitalEntity)),
- Union(15, typeof(OrbitData)),
- Union(16, typeof(BodyData)),
- Union(17, typeof(PersonalityAttribute)),
- Union(18, typeof(AgentTask)),
- // Union(19, typeof(LoadoutData)),
- Union(20, typeof(Ship)),
- Union(21, typeof(Mining)),
- Union(22, typeof(StationTowing)),
- Union(23, typeof(Survey)),
- Union(24, typeof(HaulingTask)),
- Union(25, typeof(AsteroidBeltData)),
- Union(26, typeof(GasGiantData)),
- Union(27, typeof(SunData)),
- Union(28, typeof(PlanetData)),
- Union(29, typeof(CargoBayData)),
- Union(30, typeof(DockingBayData)),
- Union(31, typeof(WeaponItemData))]
 public abstract class DatabaseEntry
 {
-    [Key(0)]
     public Guid ID = Guid.NewGuid();
 
     public override int GetHashCode()
@@ -64,20 +26,15 @@ public abstract class DatabaseEntry
     }
 }
 
-[MessagePackObject]
 public class DatabaseLink<T> : DatabaseLinkBase where T : ItemData
 {
-    [IgnoreMember]
     public T Value => ResolveRuntimeItemCatalog<T>(LinkID);
 }
 
-[MessagePackObject]
 public class DatabaseLinkBase
 {
-    [Key(0)]
     public Guid LinkID;
 
-    [IgnoreMember]
     private static IRuntimeItemCatalogReader Catalog { get; set; }
 
     protected static T ResolveRuntimeItemCatalog<T>(Guid linkId) where T : ItemData
diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md
index 4f81a5a7b..4758caddf 100644
--- a/docs/aetheria-perfect-machine-map.md
+++ b/docs/aetheria-perfect-machine-map.md
@@ -77,7 +77,8 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   binds `DatabaseLinkBase` to that typed runtime item reader before gameplay
   objects read `ItemInstance.Data.Value`. The old `LegacyItemCatalogBoundary`,
   `LegacyItemCatalogCache`, and runtime MessagePack deserializer path have been
-  deleted.
+  deleted. `DatabaseEntry` and `DatabaseLink<T>` are plain runtime identity/link
+  helpers now, not MessagePack objects or a global union root.
 - `ItemManager` no longer exposes the raw runtime item catalog reader as public
   gameplay/UI API. Temporary item instantiation bridges now go through the
   narrow `ItemManager.GetCatalogEntry<T>` method. `ItemManager` no longer
@@ -256,7 +257,10 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   contract for full .NET smokes and Eve surface reads. Neither writes state or
   owns simulation. The runtime no longer has a MessagePack catalog cache.
   `AetheriaRuntimeItemCatalog` materializes temporary `ItemData` DTOs from typed
-  item records for the old simulation object model. Item properties
+  item records for the old simulation object model. `DatabaseEntry` no longer
+  carries MessagePack union metadata; remaining item/behavior DTO MessagePack
+  keys are temporary projection metadata until typed behavior factories replace
+  reflection. Item properties
   manufacturer display is a typed snapshot consumer; loadout generation is the
   remaining runtime single-ID item lookup bridge. The old trade debug UI and
   console `give` command have been deleted. No live caller can enumerate legacy
@@ -284,9 +288,10 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   generated keyboard layout caches, and server-side `DatabaseCache` paths.
 - Shared paths: manual gameplay edits, editor edits, server updates, file load,
   file save, and migration all need to converge on one typed commit primitive.
-- Deletion line: no new behavior should be added to old `DatabaseEntry` or
-  MessagePack catalog paths except bounded migration readers that emit typed
-  `Aetheria.State` documents.
+- Deletion line: no new behavior should be added to old `ItemData` DTO
+  metadata or MessagePack catalog paths except bounded migration readers and the
+  current typed item projection bridge. `DatabaseEntry` is no longer a
+  persistence owner.
 
 ## Target Authority Map
 
@@ -435,10 +440,11 @@ First Aetheria surfaces to publish:
      `AetheriaRuntimeItemCatalog`, a typed-state-backed projection from
      `AetheriaRuntimeCatalogSnapshot`; delete `LegacyItemCatalogBoundary`,
      `LegacyItemCatalogCache`, and the runtime MessagePack deserializer path.
+   - Done: demote `DatabaseEntry` and `DatabaseLink<T>` from MessagePack
+     union/object shapes to plain runtime identity/link helpers.
    - Convert domain references from GUID/base-class patterns to typed record
      refs.
-   - Remove runtime dependency on `DatabaseEntry`/`ItemData` DTOs as item
-     instance owners.
+   - Remove runtime dependency on `ItemData` DTOs as item instance owners.
 
 5. Mesh host
    - Replace `Economy.Server` RethinkDB and LiteNetLib database authority with a