feat: adopt serialization generator v4 (field-side linkage, anchored timers) (#2586)
## Summary Adopts ModernUO.Serialization 4.0.0 across the engine. Three commits, reviewable independently: 1. **Package + tool bump to 4.0.0** (`Server.csproj`, `UOContent.csproj`, `dotnet-tools.json`). 2. **Timers → `[DeserializeTimer]`** — the 8 drifting timers (BaseLight, TreasureMapChest, MarkContainer, FillableContainer, DeathRobe, DecayedCorpse, Corpse, BaseEscortable) now store their next tick as **anchored time**: server downtime no longer consumes the remaining delay, and idle-world saves are byte-stable. This changes their wire format, so each class bumps its serialization version with a `MigrateFrom` that replays the old delta-time read through the migration schema (the new `vN.json` files carry `@AnchoredTimer`; the old ones keep `@TimerDrift`, which the generator reads forever). The 2 wall-clock timers (Aquarium, FountainOfLife) keep their exact format via `wallClock: true` — no bump. Restart methods drop their `TimeSpan.MinValue` sentinel checks: v4 invokes them **only when a timer was actually running at save**. 3. **Linkage → field-side declarations** — 175 conversions across 25 files: `[SerializableFieldSaveFlag(order)]`/`[SerializableFieldDefault(order)]` become `[SaveFlag(nameof(...), nameof(...))]` on the field, and `[SerializableFieldChanged(order)]` becomes the `fieldChanged:` argument of `[SerializableField]`. **Wire-neutral: zero migration schemas changed.** ## Verification - Solution builds with **0 errors, 0 warnings**; all three 4.0.0 packages verified indexed on nuget.org (no local feed needed). - **835 + 708 tests green.** - Generated output inspected: old-version content structs replay `ReadDeltaTime` (e.g. `V3Content.DecayTimerNext = reader.ReadDeltaTime()`), current versions write/read anchored time with the gated restart, and the wall-clock classes emit byte-identical `Write`/`ReadDateTime` framing. - Schema tool run is committed (CI's `git diff --exit-code` schema check passes): exactly the 8 expected new `vN.json` files, nothing else touched. - The conversion was scripted with a class-scoped resolver (order → same-class `[SerializableField(order)]`/`[SerializableProperty(order)]`); it planned 175/175 with zero ambiguities before applying. ## Notes - New `MigrateFrom`s use the content structs' provided `XxxDelay` property, matching the pre-existing idiom in Corpse's and TreasureMapChest's older migrations. - Follow-up candidate (separate PR, wire-neutral, any time): fold the ~150 eligible hand-written `[SerializableProperty]` setters (clamps, post-change side effects) down to `[SerializableField]` with `allowFieldChange`/`fieldChanged` hooks.
This commit is contained in:
parent
126a10ce53
commit
73f9688083
43 changed files with 667 additions and 278 deletions
|
|
@ -3,19 +3,22 @@ using ModernUO.Serialization;
|
|||
|
||||
namespace Server.Items;
|
||||
|
||||
[SerializationGenerator(2, false)]
|
||||
[SerializationGenerator(3, false)]
|
||||
public abstract partial class FillableContainer : LockableContainer
|
||||
{
|
||||
[TimerDrift]
|
||||
[SerializableField(1)]
|
||||
[DeserializeTimer(nameof(DeserializeRespawnTimer))]
|
||||
private Timer _respawnTimer;
|
||||
|
||||
[DeserializeTimerField(1)]
|
||||
private void DeserializeRespawnTimer(TimeSpan delay)
|
||||
private void DeserializeRespawnTimer(TimeSpan delay) => _respawnTimer = Timer.DelayCall(delay, Respawn);
|
||||
|
||||
private void MigrateFrom(V2Content content)
|
||||
{
|
||||
if (delay > TimeSpan.MinValue)
|
||||
_contentType = content.ContentType;
|
||||
|
||||
if (content.RespawnTimerDelay != TimeSpan.MinValue)
|
||||
{
|
||||
_respawnTimer = Timer.DelayCall(delay, Respawn);
|
||||
DeserializeRespawnTimer(content.RespawnTimerDelay);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ using ModernUO.Serialization;
|
|||
|
||||
namespace Server.Items;
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
[SerializationGenerator(1, false)]
|
||||
public partial class MarkContainer : LockableContainer
|
||||
{
|
||||
[TimerDrift]
|
||||
[SerializableField(1, getter: "private", setter: "private")]
|
||||
[DeserializeTimer(nameof(DeserializeRelockTimer))]
|
||||
private InternalTimer _relockTimer;
|
||||
|
||||
[DeserializeTimerField(1)]
|
||||
private void DeserializeRelockTimer(TimeSpan delay)
|
||||
{
|
||||
if (!Locked && _autoLock)
|
||||
|
|
@ -19,6 +18,19 @@ public partial class MarkContainer : LockableContainer
|
|||
}
|
||||
}
|
||||
|
||||
private void MigrateFrom(V0Content content)
|
||||
{
|
||||
_autoLock = content.AutoLock;
|
||||
_targetMap = content.TargetMap;
|
||||
_target = content.Target;
|
||||
_description = content.Description;
|
||||
|
||||
if (content.RelockTimerDelay != TimeSpan.MinValue)
|
||||
{
|
||||
DeserializeRelockTimer(content.RelockTimerDelay);
|
||||
}
|
||||
}
|
||||
|
||||
[SerializableField(2)]
|
||||
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
||||
private Map _targetMap;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using Server.Network;
|
|||
|
||||
namespace Server.Items;
|
||||
|
||||
[SerializationGenerator(3, false)]
|
||||
[SerializationGenerator(4, false)]
|
||||
public partial class TreasureMapChest : LockableContainer
|
||||
{
|
||||
[Tidy]
|
||||
|
|
@ -29,12 +29,11 @@ public partial class TreasureMapChest : LockableContainer
|
|||
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
||||
private int _level;
|
||||
|
||||
[TimerDrift]
|
||||
[SerializableField(4)]
|
||||
[SerializedCommandProperty(AccessLevel.GameMaster)]
|
||||
[DeserializeTimer(nameof(DeserializeExpireTimer))]
|
||||
private Timer _expireTimer;
|
||||
|
||||
[DeserializeTimerField(4)]
|
||||
private void DeserializeExpireTimer(TimeSpan delay)
|
||||
{
|
||||
if (!_temporary)
|
||||
|
|
@ -43,6 +42,20 @@ public partial class TreasureMapChest : LockableContainer
|
|||
}
|
||||
}
|
||||
|
||||
private void MigrateFrom(V3Content content)
|
||||
{
|
||||
_guardians = content.Guardians;
|
||||
_temporary = content.Temporary;
|
||||
_owner = content.Owner;
|
||||
_level = content.Level;
|
||||
_lifted = content.Lifted;
|
||||
|
||||
if (content.ExpireTimerDelay != TimeSpan.MinValue)
|
||||
{
|
||||
DeserializeExpireTimer(content.ExpireTimerDelay);
|
||||
}
|
||||
}
|
||||
|
||||
[Tidy]
|
||||
[CanBeNull]
|
||||
[SerializableField(5, setter: "private")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue