refactor(spawners): replace DynamicJson with typed SpawnerDto records (#2505)
## Summary Removes the dated `DynamicJson` JSON helper and migrates spawner JSON (de)serialization to a polymorphic `record SpawnerDto` hierarchy. `DynamicJson` was the last remaining consumer (regions moved off it in #1400). The key correctness improvement: **System.Text.Json deserializes plain DTO records, never a live `Item`.** Previously, deserializing directly into an `Item` meant STJ constructed world-registered objects *before* the data was validated — a malformed/hand-edited spawn file could leave orphaned spawner Items in the world save. Now a parse failure is GC-only; `dto.ToSpawner()` constructs the spawner only from a fully-validated DTO and self-cleans on failure. ## What changed - **New:** `SpawnerDto` (abstract) + `SpawnerDataDto` / `RegionSpawnerDto` / `ProximitySpawnerDto`, each marked with a reusable `[JsonDiscoverableType]` opt-in attribute. Auto-discovered at the `Configure` phase — no manual registration list (avoids the regions `Register<T>()` footgun), open to custom spawner subtypes. - **Symmetric mapping:** `BaseSpawner.ToDto()` (export) ⇄ `SpawnerDto.ToSpawner()` (import). `ToSpawner()` deletes-and-rethrows on any failure, so the importer can never orphan an Item. - **`SpawnerJsonSerializer`** wires `$type` polymorphism on the `SpawnerDto` root with loud collision/constructibility validation. - **Import/export commands** rewired to the typed DTO path (reflection `FindTypeByName`/`CreateInstance` removed). - **Data migration:** the 109 `Distribution/Data/Spawns/**` files moved from `"type"`→`"$type"` and legacy `homeRange`→`spawnBounds`. The runtime still *reads* legacy `homeRange` for external files. The `homeRange→spawnBounds` formula is proven equivalent to the runtime conversion (`BoundsEquivalenceTests`, hr=0/1/3/7). - **Deleted:** `Projects/Server/Json/DynamicJson.cs`. Sparse export output matches the legacy `ToJson` (nullable DTO properties + `WhenWritingNull`). Binary world-save serialization is untouched. ## Tests - DTO round-trip per spawner type; sparse-default omission; legacy `homeRange` read; export/import file round-trip. - `Import_MalformedFile_LeaksNoWorldItems` — proves a mid-array parse failure constructs zero world Items. - `AllSpawnFilesLoadTests` — every migrated spawn file deserializes and builds. - Duplicate-discriminator validation. - UOContent.Tests 485/485, Server.Tests 710/710, build clean. ## Follow-up (not in this PR) `Rectangle3DConverter.Write` (in `Projects/Server/`) omits `z1/z2` when `Start.Z == -128`, so a future server-side export of a `homeRange`-style spawner round-trips depth 256→255. Pre-existing and out of scope here (Server change); the migrated data reads correctly. Worth a separate small converter PR.
This commit is contained in:
Kamron Batman
GitHub
parent
a26219c837
commit
d8a64f3316
135 changed files with 7654 additions and 6079 deletions
|
|
@ -1,6 +1,6 @@
|
|||
[
|
||||
[
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "0bb98d0c-0614-431b-a6ce-c30718f447c8",
|
||||
"name": "Spawner (401)",
|
||||
"location": [447, 25, -1],
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "0e708303-8a2d-4207-bdc3-d7f732e04efe",
|
||||
"name": "Spawner (401)",
|
||||
"location": [496, 75, 0],
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "1210b304-4b1a-47be-a503-9f490764d069",
|
||||
"name": "Spawner (401)",
|
||||
"location": [287, 81, -1],
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "13e0051b-bff0-4826-9e89-73ea9ec64e7a",
|
||||
"name": "Spawner (401)",
|
||||
"location": [320, 207, -1],
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "182c0603-13fa-414f-849c-dcbde31a739a",
|
||||
"name": "Spawner (401)",
|
||||
"location": [479, 168, -1],
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "20977621-9e81-4c25-b802-19fa12fc3633",
|
||||
"name": "Spawner (401)",
|
||||
"location": [323, 90, -1],
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "218aaa26-c02b-4605-8c79-c9879523ea0b",
|
||||
"name": "Spawner (401)",
|
||||
"location": [356, 40, -1],
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "298afdb1-74fb-4668-9bc2-5f625a61caed",
|
||||
"name": "Spawner (401)",
|
||||
"location": [478, 206, -1],
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "2a98c34c-cb3d-4d28-8c12-1a3cf7cc58ad",
|
||||
"name": "Spawner (401)",
|
||||
"location": [330, 136, 0],
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "2be25342-c032-406a-af47-8eb5994c0875",
|
||||
"name": "Spawner (401)",
|
||||
"location": [427, 256, -1],
|
||||
|
|
@ -163,7 +163,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "32a2e0d8-8246-42ff-8e13-c15b51a9f73f",
|
||||
"name": "Spawner (401)",
|
||||
"location": [470, 30, -2],
|
||||
|
|
@ -180,7 +180,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "42bbf95d-6b39-4df6-a4f4-7a8d385b49ef",
|
||||
"name": "Spawner (401)",
|
||||
"location": [442, 205, -1],
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "48538f93-9afa-44c9-baab-b1c3612bdde5",
|
||||
"name": "Spawner (401)",
|
||||
"location": [356, 234, -1],
|
||||
|
|
@ -212,7 +212,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "5110399b-8443-448e-a68c-f59ac2303716",
|
||||
"name": "Spawner (401)",
|
||||
"location": [441, 78, -1],
|
||||
|
|
@ -229,7 +229,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "55898d74-f2cf-4c30-953e-e5f3d9a3b5bf",
|
||||
"name": "Spawner (401)",
|
||||
"location": [278, 233, 0],
|
||||
|
|
@ -246,7 +246,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "59819649-f460-4934-ba36-a89a98aa13f2",
|
||||
"name": "Spawner (401)",
|
||||
"location": [320, 114, -1],
|
||||
|
|
@ -262,7 +262,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "59d35721-49b5-4ff9-9c91-fad1b3d4b953",
|
||||
"name": "Spawner (401)",
|
||||
"location": [395, 33, -1],
|
||||
|
|
@ -278,7 +278,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "5bc9de9b-c7d7-4152-9fd1-19e57598100e",
|
||||
"name": "Spawner (401)",
|
||||
"location": [320, 114, -1],
|
||||
|
|
@ -294,7 +294,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "5c28d40c-81f7-428d-b661-6e272aeabf3d",
|
||||
"name": "Spawner (401)",
|
||||
"location": [480, 227, -1],
|
||||
|
|
@ -310,7 +310,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "613d79a6-10e0-4465-9937-142ee7e701b0",
|
||||
"name": "Spawner (401)",
|
||||
"location": [289, 154, 5],
|
||||
|
|
@ -326,7 +326,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "646d5241-162f-477e-a05c-17ba7eb95a83",
|
||||
"name": "Spawner (401)",
|
||||
"location": [379, 147, -1],
|
||||
|
|
@ -343,7 +343,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "6492e163-beb3-4abc-a674-921cbf5ba5df",
|
||||
"name": "Spawner (401)",
|
||||
"location": [356, 234, -1],
|
||||
|
|
@ -359,7 +359,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "693a953a-75cf-43df-9708-b781c8a04439",
|
||||
"name": "Spawner (401)",
|
||||
"location": [325, 172, -1],
|
||||
|
|
@ -376,7 +376,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "74182f58-a286-4576-9615-f92bbd4e7b71",
|
||||
"name": "Spawner (401)",
|
||||
"location": [378, 236, -1],
|
||||
|
|
@ -392,7 +392,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "92450262-dc59-4666-b8bd-233fa481ddcb",
|
||||
"name": "Spawner (401)",
|
||||
"location": [400, 174, -1],
|
||||
|
|
@ -408,7 +408,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "93ce2586-d403-49a2-acbb-034ef0ee797a",
|
||||
"name": "Spawner (401)",
|
||||
"location": [278, 233, 0],
|
||||
|
|
@ -424,7 +424,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "968ff190-b606-41f5-8cf0-36e15d3fd7d4",
|
||||
"name": "Spawner (401)",
|
||||
"location": [382, 82, -1],
|
||||
|
|
@ -440,7 +440,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "9e641eb9-2f8a-41ae-afb9-24a4b5879a0a",
|
||||
"name": "Spawner (401)",
|
||||
"location": [305, 28, 0],
|
||||
|
|
@ -456,7 +456,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "a1434ffe-19f2-4076-b1ce-28e59dc9f627",
|
||||
"name": "Spawner (401)",
|
||||
"location": [496, 75, 0],
|
||||
|
|
@ -472,7 +472,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "a42b1d2c-dcd4-4d43-aada-f5707a5f9e9f",
|
||||
"name": "Spawner (401)",
|
||||
"location": [468, 141, -1],
|
||||
|
|
@ -488,7 +488,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "a81f4ff2-ee77-4e1f-968d-335a0ecbe7b9",
|
||||
"name": "Spawner (401)",
|
||||
"location": [427, 256, -1],
|
||||
|
|
@ -505,7 +505,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "b0f74ae9-9e85-4525-9903-6e69c2f818e4",
|
||||
"name": "Spawner (401)",
|
||||
"location": [309, 15, 0],
|
||||
|
|
@ -523,7 +523,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "bbfc66e4-a4fd-486a-960e-5cb7c64c2e72",
|
||||
"name": "Spawner (401)",
|
||||
"location": [456, 48, -1],
|
||||
|
|
@ -540,7 +540,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "c2ca4b73-4847-47ab-83de-c3f0abb570a9",
|
||||
"name": "Spawner (401)",
|
||||
"location": [493, 202, -1],
|
||||
|
|
@ -556,7 +556,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "c85f6fd0-ad43-4e05-a43e-b49002b7f22c",
|
||||
"name": "Spawner (401)",
|
||||
"location": [372, 201, -1],
|
||||
|
|
@ -573,7 +573,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "cf26832d-8e20-4277-8491-91461dd2995e",
|
||||
"name": "Spawner (401)",
|
||||
"location": [487, 118, -1],
|
||||
|
|
@ -590,7 +590,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "d03c82ab-0be4-4818-8708-14afba5d8eee",
|
||||
"name": "Spawner (401)",
|
||||
"location": [366, 13, -1],
|
||||
|
|
@ -606,7 +606,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "d5daa218-49a1-446c-a871-a7ebc77cacf9",
|
||||
"name": "Spawner (401)",
|
||||
"location": [480, 227, -1],
|
||||
|
|
@ -622,7 +622,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "d8a6cfe1-0e71-423a-94e9-4ad92ef8d73d",
|
||||
"name": "Spawner (401)",
|
||||
"location": [330, 136, 0],
|
||||
|
|
@ -638,7 +638,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "d99b3aa7-013c-4dd9-8258-ec68e91e6bf5",
|
||||
"name": "Spawner (401)",
|
||||
"location": [443, 128, -1],
|
||||
|
|
@ -656,7 +656,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "dcade1a7-1652-4eb7-a550-d9ed7a7449ac",
|
||||
"name": "Spawner (401)",
|
||||
"location": [442, 205, -1],
|
||||
|
|
@ -673,7 +673,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "e12bb836-80f3-4ce1-b068-9d2485922b0f",
|
||||
"name": "Spawner (401)",
|
||||
"location": [290, 28, 0],
|
||||
|
|
@ -689,7 +689,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "e764f652-de2c-420f-8419-7d29a2d6cd9c",
|
||||
"name": "Spawner (401)",
|
||||
"location": [287, 81, -1],
|
||||
|
|
@ -706,7 +706,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "f20c08f3-28e9-47a3-b24e-b31370ce2c18",
|
||||
"name": "Spawner (401)",
|
||||
"location": [447, 25, -1],
|
||||
|
|
@ -722,7 +722,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "f909d2a4-b3bf-4d0c-b07c-f36839c99209",
|
||||
"name": "Spawner (401)",
|
||||
"location": [479, 168, -1],
|
||||
|
|
@ -738,7 +738,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "f9c8b1af-1ea5-466d-90a1-e956f8c8de31",
|
||||
"name": "Spawner (401)",
|
||||
"location": [266, 26, 0],
|
||||
|
|
@ -754,7 +754,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"type": "Spawner",
|
||||
"$type": "Spawner",
|
||||
"guid": "ff72dd04-bba5-4a6f-8899-d851b4c1fe88",
|
||||
"name": "Spawner (401)",
|
||||
"location": [480, 227, -1],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue