## 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.
102 lines
3.7 KiB
C#
102 lines
3.7 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: ExportSpawnersCommand.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using Server.Commands.Generic;
|
|
using Server.Network;
|
|
|
|
namespace Server.Engines.Spawners;
|
|
|
|
public class ExportSpawnersCommand : BaseCommand
|
|
{
|
|
public static void Configure()
|
|
{
|
|
TargetCommands.Register(new ExportSpawnersCommand());
|
|
}
|
|
|
|
public ExportSpawnersCommand()
|
|
{
|
|
AccessLevel = AccessLevel.GameMaster;
|
|
Supports = CommandSupport.AllItems & ~CommandSupport.Contained;
|
|
Commands = ["ExportSpawners"];
|
|
ObjectTypes = ObjectTypes.Items;
|
|
Usage = "ExportSpawners";
|
|
Description = "Exports the given spawners to a file";
|
|
ListOptimized = true;
|
|
}
|
|
|
|
public override void ExecuteList(CommandEventArgs e, List<object> list)
|
|
{
|
|
var path = e.Arguments.Length == 0 ? string.Empty : e.Arguments[0].Trim();
|
|
var condition = e.Arguments.Length == 2 ? e.Arguments[1].Trim() : string.Empty;
|
|
|
|
if (string.IsNullOrEmpty(path))
|
|
{
|
|
path = Path.Combine(Core.BaseDirectory, $"Data/Spawns/{Utility.GetTimeStamp()}.json");
|
|
}
|
|
else
|
|
{
|
|
var directory = Path.GetDirectoryName(Path.GetFullPath(path!))!;
|
|
if (!Path.IsPathRooted(path))
|
|
{
|
|
path = Path.Combine(Core.BaseDirectory, path);
|
|
PathUtility.EnsureDirectory(directory);
|
|
}
|
|
else if (!Directory.Exists(directory))
|
|
{
|
|
LogFailure("Directory doesn't exist.");
|
|
return;
|
|
}
|
|
}
|
|
|
|
NetState.FlushAll();
|
|
|
|
var spawnRecords = new List<SpawnerDto>(list.Count);
|
|
for (var i = 0; i < list.Count; i++)
|
|
{
|
|
// Not a spawner, not on a valid map, or is in a container
|
|
if (list[i] is not BaseSpawner spawner || spawner.Map == Map.Internal || spawner.Parent != null)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (!string.IsNullOrEmpty(spawner.Name) && !spawner.Name.StartsWith(
|
|
condition,
|
|
StringComparison.OrdinalIgnoreCase
|
|
))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
spawnRecords.Add(spawner.ToDto());
|
|
}
|
|
|
|
if (spawnRecords.Count == 0)
|
|
{
|
|
LogFailure("No matching spawners found.");
|
|
return;
|
|
}
|
|
|
|
e.Mobile.SendMessage("Exporting spawners...");
|
|
|
|
// Compact layout (UTF-8, no BOM, LF) keeps re-exports diff-friendly.
|
|
PathUtility.EnsureDirectory(Path.GetDirectoryName(path));
|
|
File.WriteAllText(path, SpawnerJsonSerializer.SerializeCompact(spawnRecords));
|
|
|
|
e.Mobile.SendMessage($"Spawners exported to {path}");
|
|
}
|
|
}
|