fix(core): Updates to serialization (#590)

- [X] Adds `AdhocPersistence` which replaces RunUO `Persistence`
- [X] Fixes a few minor bugs with EntityPersistence deserialization
- [X] Reverts/updates some serialization changes
This commit is contained in:
Kamron Batman 2021-05-09 00:10:39 -07:00 • committed by GitHub
parent f0969223f7
commit 6e9477ea13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 370 additions and 248 deletions

View file

@ -1,3 +1,18 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2021 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: Serial.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.Runtime.CompilerServices;
@ -12,54 +27,73 @@ namespace Server
public uint Value { get; }
public bool IsMobile => Value > 0 && Value < World.ItemOffset;
public bool IsMobile
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => Value > 0 && Value < World.ItemOffset;
}
public bool IsItem => Value >= World.ItemOffset && Value < World.MaxItemSerial;
public bool IsItem
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => Value >= World.ItemOffset && Value < World.MaxItemSerial;
}
public bool IsValid => Value > 0;
public bool IsValid
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => this != MinusOne;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public override int GetHashCode() => Value.GetHashCode();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int CompareTo(Serial other) => Value.CompareTo(other.Value);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int CompareTo(uint other) => Value.CompareTo(other);
public override bool Equals(object obj)
{
if (obj is Serial serial)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public override bool Equals(object obj) =>
obj switch
{
return this == serial;
}
if (obj is uint u)
{
return Value == u;
}
return false;
}
Serial serial => this == serial,
uint u => Value == u,
_ => false
};
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool operator ==(Serial l, Serial r) => l.Value == r.Value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool operator !=(Serial l, Serial r) => l.Value != r.Value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool operator >(Serial l, Serial r) => l.Value > r.Value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool operator <(Serial l, Serial r) => l.Value < r.Value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool operator >=(Serial l, Serial r) => l.Value >= r.Value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool operator <=(Serial l, Serial r) => l.Value <= r.Value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public override string ToString() => $"0x{Value:X8}";
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator uint(Serial a) => a.Value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator Serial(uint a) => new(a);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool Equals(Serial other) => Value == other.Value;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int ToInt32() => (int)Value;
}
}