fix: game object types should be included in swagger with a functioning type hierarchy

Author: pandinocoder

Framework/Intersect.Framework.Core/Config/DatabaseOptions.cs

@@ -20,11 +20,11 @@ public partial class DatabaseOptions
 
     public ushort Port { get; set; } = 3306;
 
-    public string Database { get; set; } = "";
+    public string Database { get; set; } = string.Empty;
 
-    public string Username { get; set; } = "";
+    public string Username { get; set; } = string.Empty;
 
-    public string Password { get; set; } = "";
+    public string Password { get; set; } = string.Empty;
 
     [JsonConverter(typeof(StringEnumConverter))]
     [JsonProperty(

Framework/Intersect.Framework.Core/Config/Options.cs

@@ -8,7 +8,7 @@ namespace Intersect;
 public partial class Options
 {
     //Caching Json
-    private static string optionsCompressed = "";
+    private static string optionsCompressed = string.Empty;
 
     [JsonProperty("AdminOnly", Order = -3)]
     protected bool _adminOnly = false;

Framework/Intersect.Framework.Core/Config/SmtpSettings.cs

@@ -2,19 +2,19 @@
 
 public partial class SmtpSettings
 {
-    public string FromAddress { get; set; } = "";
+    public string FromAddress { get; set; } = string.Empty;
 
-    public string FromName { get; set; } = "";
+    public string FromName { get; set; } = string.Empty;
 
-    public string Host { get; set; } = "";
+    public string Host { get; set; } = string.Empty;
 
     public int Port { get; set; } = 587;
 
     public bool UseSsl { get; set; } = true;
 
-    public string Username { get; set; } = "";
+    public string Username { get; set; } = string.Empty;
 
-    public string Password { get; set; } = "";
+    public string Password { get; set; } = string.Empty;
 
     public bool IsValid()
     {

Framework/Intersect.Framework.Core/Configuration/ClientConfiguration.cs

@@ -202,12 +202,12 @@ public void Validate()
     /// <summary>
     /// The address for the update manifest file generated by the editor.
     /// </summary>
-    public string UpdateUrl { get; set; } = "";
+    public string UpdateUrl { get; set; } = string.Empty;
 
     /// <summary>
     /// Sets a custom mouse cursor.
     /// </summary>
-    public string MouseCursor { get; set; } = "";
+    public string MouseCursor { get; set; } = string.Empty;
 
     /// <summary>
     /// Determines the time it takes to fade-in or fade-out a song when no other instructions are given.

Framework/Intersect.Framework.Core/Descriptors/GameObjectTypeExtensions.cs

@@ -53,6 +53,13 @@ public static DatabaseObjectLookup GetLookup(this GameObjectType gameObjectType)
         return DatabaseObjectLookup.GetLookup(GetObjectType(gameObjectType));
     }
 
+    public static bool TryGetLookup(this GameObjectType gameObjectType,
+        [NotNullWhen(true)] out DatabaseObjectLookup? lookup)
+    {
+        lookup = GetLookup(gameObjectType);
+        return lookup != default;
+    }
+
     public static IDatabaseObject CreateNew(this GameObjectType gameObjectType)
     {
         var instance = Activator.CreateInstance(

Framework/Intersect.Framework.Core/GameObjects/AnimationBase.cs

@@ -77,5 +77,5 @@ public AnimationBase()
     public bool CompleteSound { get; set; }
 
     /// <inheritdoc />
-    public string Folder { get; set; } = "";
+    public string Folder { get; set; } = string.Empty;
 }

Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorBooleanAttribute.cs

@@ -23,6 +23,6 @@ public override string Format(Type stringsType, object value)
             throw new InvalidOperationException($"{stringsType.FullName}.{nameof(stringsType)} is missing.");
         }
 
-        return formatBooleanMethodInfo.Invoke(null, new[] { value, Style })?.ToString();
+        return formatBooleanMethodInfo.Invoke(null, [value, Style])?.ToString();
     }
 }

Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorDictionaryAttribute.cs

@@ -129,7 +129,7 @@ private static GetStringFromLocaleDictionaryGeneric CreateWeaklyTypedDelegate<TK
         var dictionaryType = dictionaryObject.GetType();
         if (!_cachedFormatters.TryGetValue(dictionaryType, out var formatter))
         {
-            var createdDelegate = _methodInfoCreateWeaklyTypedDelegate.MakeGenericMethod(key.GetType()).Invoke(null, Array.Empty<object>());
+            var createdDelegate = _methodInfoCreateWeaklyTypedDelegate.MakeGenericMethod(key.GetType()).Invoke(null, []);
             if (createdDelegate is not GetStringFromLocaleDictionaryGeneric genericFormatter)
             {
                 throw new InvalidOperationException();

Framework/Intersect.Framework.Core/GameObjects/Annotations/EditorFormattedAttribute.cs

@@ -84,7 +84,7 @@ private static object InvokeFormatterMethod(IEnumerable<MethodInfo> methodInfos,
 
         if (formatterMethodInfo.GetParameters().Length == 1)
         {
-            return formatterMethodInfo.Invoke(default, new[] { value });
+            return formatterMethodInfo.Invoke(default, [value]);
         }
 
         return formatterMethodInfo.Invoke(

Framework/Intersect.Framework.Core/GameObjects/ClassBase.cs

@@ -17,16 +17,15 @@ public partial class ClassBase : DatabaseObject<ClassBase>, IFolderable
     public const long DEFAULT_EXPERIENCE_INCREASE = 50;
 
     [NotMapped]
-    public int[] BaseStat = new int[Enum.GetValues<Stat>().Length];
+    public int[] BaseStat { get; set; } = new int[Enum.GetValues<Stat>().Length];
 
     [NotMapped]
-    public long[] BaseVital = new long[Enum.GetValues<Vital>().Length];
+    public long[] BaseVital { get; set; } = new long[Enum.GetValues<Vital>().Length];
 
-    [NotMapped]
-    public Dictionary<int, long> ExperienceOverrides = new Dictionary<int, long>();
+    [NotMapped] public Dictionary<int, long> ExperienceOverrides { get; set; } = [];
 
     [NotMapped]
-    public List<ClassItem> Items = new List<ClassItem>();
+    public List<ClassItem> Items { get; set; } = [];
 
     [JsonIgnore]
     private long mBaseExp;
@@ -35,19 +34,19 @@ public partial class ClassBase : DatabaseObject<ClassBase>, IFolderable
     private long mExpIncrease;
 
     [NotMapped]
-    public List<ClassSpell> Spells = new List<ClassSpell>();
+    public List<ClassSpell> Spells { get; set; } = [];
 
     [NotMapped]
-    public List<ClassSprite> Sprites = new List<ClassSprite>();
+    public List<ClassSprite> Sprites { get; set; } = [];
 
     [NotMapped]
-    public int[] StatIncrease = new int[Enum.GetValues<Stat>().Length];
+    public int[] StatIncrease { get; set; } = new int[Enum.GetValues<Stat>().Length];
 
     [NotMapped]
-    public long[] VitalIncrease = new long[Enum.GetValues<Vital>().Length];
+    public long[] VitalIncrease { get; set; } = new long[Enum.GetValues<Vital>().Length];
 
     [NotMapped]
-    public long[] VitalRegen = new long[Enum.GetValues<Vital>().Length];
+    public long[] VitalRegen { get; set; } = new long[Enum.GetValues<Vital>().Length];
 
     [JsonConstructor]
     public ClassBase(Guid id) : base(id)
@@ -243,7 +242,7 @@ public string ExpOverridesJson
     }
 
     /// <inheritdoc />
-    public string Folder { get; set; } = "";
+    public string Folder { get; set; } = string.Empty;
 
     public long ExperienceToNextLevel(int level)
     {
@@ -284,9 +283,9 @@ public SpellBase Get()
 
 public partial class ClassSprite
 {
-    public string Face = "";
+    public string Face = string.Empty;
 
     public Gender Gender;
 
-    public string Sprite = "";
+    public string Sprite = string.Empty;
 }