feat: isolate TextStorage into custom type

Author: Krzyhau

Core/Conversion/Formats/TextStorageConverter.cs

@@ -1,10 +1,11 @@
-using FEZRepacker.Core.FileSystem;
-using FEZRepacker.Core.Helpers;
+using FEZRepacker.Core.Definitions.Game.Helpers;
+using FEZRepacker.Core.FileSystem;
 using FEZRepacker.Core.Helpers.Json;
 
 namespace FEZRepacker.Core.Conversion.Formats
 {
-    using TextStorage = OrderedDictionary<string, OrderedDictionary<string, string>>;
+    using TextStorageContainer = IDictionary<string, IDictionary<string, string>>;
+    
     internal class TextStorageConverter : FormatConverter<TextStorage>
     {
         private const string BundleFileFormat = ".feztxt";
@@ -13,12 +14,13 @@ internal class TextStorageConverter : FormatConverter<TextStorage>
 
         public override FileBundle ConvertTyped(TextStorage data)
         {
-            return ConfiguredJsonSerializer.SerializeToFileBundle(BundleFileFormat, data);
+            return ConfiguredJsonSerializer.SerializeToFileBundle(BundleFileFormat, data.AllResources);
         }
 
         public override TextStorage DeconvertTyped(FileBundle bundle)
         {
-            return ConfiguredJsonSerializer.DeserializeFromFileBundle<TextStorage>(bundle);
+            var allResources = ConfiguredJsonSerializer.DeserializeFromFileBundle<TextStorageContainer>(bundle);
+            return new TextStorage {AllResources = allResources};
         }
     }
 }

Core/Definitions/Game/Helpers/TextStorage.cs

@@ -0,0 +1,18 @@
+namespace FEZRepacker.Core.Definitions.Game.Helpers
+{
+    [XnbReaderType(
+        "Microsoft.Xna.Framework.Content.DictionaryReader`2[[" +
+                    "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]," +
+                    "[System.Collections.Generic.Dictionary`2[[" +
+                        "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]," +
+                        "[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" +
+                    "]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" +
+                "]]")]
+    // Wrapper class for text storage asset type. Helps with its management.
+    // Original game reads dictionary type directly.
+    public class TextStorage
+    {
+        [XnbProperty(SkipIdentifier = true, UseConverter = true)]
+        public IDictionary<string, IDictionary<string, string>> AllResources { get; set; }
+    }
+}

Core/Helpers/Json/JsonContexts.cs

@@ -50,7 +50,7 @@ internal partial class SkyJsonSerializerContext : JsonSerializerContext {}
     [JsonSerializable(typeof(SpriteFontPropertiesJsonModel))]
     internal partial class SpriteFontJsonSerializerContext : JsonSerializerContext {}
 
-    [JsonSerializable(typeof(OrderedDictionary<string, OrderedDictionary<string, string>>))]
+    [JsonSerializable(typeof(IDictionary<string, IDictionary<string, string>>))]
     internal partial class TextStorageJsonSerializerContext : JsonSerializerContext {}
 
     [JsonSerializable(typeof(TrackedSong))]

Core/XNB/ContentSerialization/System/DictionaryContentSerializer.cs

@@ -2,7 +2,7 @@
 
 namespace FEZRepacker.Core.XNB.ContentSerialization.System
 {
-    internal class DictionaryContentSerializer<K, V> : XnbContentSerializer<OrderedDictionary<K, V>> where K : notnull
+    internal class DictionaryContentSerializer<K, V> : XnbContentSerializer<IDictionary<K, V>> where K : notnull
     {
         private XnbAssemblyQualifier _name;
         private bool skipKeyIdentifier;

Core/XNB/ContentTypes/TextStorageContentIdentity.cs

@@ -1,5 +1,4 @@
-using FEZRepacker.Core.Helpers;
-using FEZRepacker.Core.XNB.ContentSerialization;
+using FEZRepacker.Core.XNB.ContentSerialization;
 using FEZRepacker.Core.XNB.ContentSerialization.System;
 
 namespace FEZRepacker.Core.XNB.ContentTypes
@@ -8,7 +7,8 @@ internal class TextStorageContentIdentity : XnbPrimaryContentIdentity
     {
         protected override List<XnbContentSerializer> ContentSerializersFactory => new()
         {
-            new DictionaryContentSerializer<string, OrderedDictionary<string, string>>(),
+            new TextStorageContentSerializer().MarkPrivate(),
+            new DictionaryContentSerializer<string, IDictionary<string, string>>(),
             new StringContentSerializer(),
             new DictionaryContentSerializer<string, string>()
         };

Core/XNB/XnbAssemblyQualifier.cs

@@ -166,6 +166,12 @@ public static XnbAssemblyQualifier GetForType(Type type)
             {
                 fallback.Specification = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
             }
+            
+            // match specific dictionary type usage
+            if (fallback.Name.Contains("IDictionary"))
+            {
+                fallback.Name = fallback.Name.Replace("IDictionary", "Dictionary");
+            }
 
             fallback.AppendGenericTypesFromType(type);
             _xnbTypeCache[type] = fallback;

Core/XNB/XnbPrimaryContentIdentity.cs

@@ -29,10 +29,6 @@ internal abstract class XnbPrimaryContentIdentity
         public XnbPrimaryContentIdentity()
         {
             ContentSerializers = ContentSerializersFactory;
-            if (PrimaryContentSerializer.IsPrivate)
-            {
-                throw new XnbSerializationException($"{this.GetType().Name} has a private primary content type!");
-            }
         }
 
         public XnbContentSerializer? FindByReaderQualifier(XnbAssemblyQualifier qualifier)