ci: Update Cryville.Audio (Amend)

.editorconfig

@@ -1,6 +1,9 @@
 # Remove the line below if you want to inherit .editorconfig settings from higher directories
 root = true
 
+[*]
+charset = utf-8
+
 # C# files
 [*.cs]
 

Assets/Animations.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ff84d017aa87efe40a398305f6c66f4d
-folderAsset: yes
-timeCreated: 1611481582
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/Canvas.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c96c5f91fd684d14d9d4c09a5f34ee5d
-timeCreated: 1637144068
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/IConfig.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2e0c61e29fd90f04b9e41265d93e2029
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/IMain.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2162866fb7549724a85cb3c854a136ad
-timeCreated: 1637144548
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/IQuit.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6e50faab4238b5548bb05a7d421f5405
-timeCreated: 1637145598
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/ISettings.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8b9f1682ee8026b468ad15885e1ff6a5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/IStartup.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9d0c0a0c88a0e7a43b77b0065bb64721
-timeCreated: 1637144134
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/TMain_Config.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 82867c59112ff5a419fbea2ebff2d3b9
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/TQuit_.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0cc97e0bf50ad9c4e834c28e6eddf416
-timeCreated: 1637145877
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/TSettings_.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9f6fb5723dba03d42b9e8a3c3e9091a5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/TStartup_Main.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 63a0e2075f5ba8d489d8cd318c14720b
-timeCreated: 1637144068
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/T_Quit.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cc249d3462d795b46aff263bc04baee2
-timeCreated: 1637144561
-licenseType: Free
-NativeFormatImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Animations/T_Settings.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 961473ba26b4b1942806c224266f8db7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Console.unity.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8a36c371ab6077d43ac28fe09b0fe675
-timeCreated: 1620725915
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/AsyncDelivery.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	/// <summary>
@@ -20,13 +20,13 @@ namespace Cryville.Common {
 		/// <param name="succeeded">Whether the task has succeeded.</param>
 		/// <param name="result">The result.</param>
 		public void Deliver(bool succeeded, T result) {
-			if (Destination != null) Destination(succeeded, result);
+			Destination?.Invoke(succeeded, result);
 		}
 		/// <summary>
 		/// Cancels the task.
 		/// </summary>
 		public void Cancel() {
-			if (CancelSource != null) CancelSource();
+			CancelSource?.Invoke();
 		}
 	}
 }

Assets/Cryville/Common/BinderAttribute.cs

@@ -13,7 +13,7 @@ namespace Cryville.Common {
 		public static Binder CreateBinderOfType(Type type) {
 			var l = type.GetCustomAttributes(typeof(BinderAttribute), true);
 			if (l.Length > 0) {
-				return (Binder)ReflectionHelper.InvokeEmptyConstructor(
+				return (Binder)Activator.CreateInstance(
 					((BinderAttribute)l[0]).BinderType
 				);
 			}
@@ -35,8 +35,8 @@ namespace Cryville.Common {
 				return null;
 			else if (type.IsAssignableFrom(value.GetType()))
 				return value;
-			else if (type.IsEnum && value is string) {
-				return Enum.Parse(type, (string)value);
+			else if (type.IsEnum && value is string strValue) {
+				return Enum.Parse(type, strValue);
 			}
 			throw new InvalidCastException(string.Format("Cannot cast {0} to {1}", value.GetType(), type));
 		}

Assets/Cryville/Common/Buffers/ArrayPool.cs

@@ -1,65 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of arrays of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The item type of the arrays in the pool.</typeparam>
-	public class ArrayPool<T> {
-		private class Bucket : ObjectPool<T[]> {
-			readonly int _size;
-			public Bucket(int size, int capacity) : base(capacity) {
-				_size = size;
-			}
-			protected override T[] Construct() {
-				return new T[_size];
-			}
-		}
-		readonly Bucket[] _buckets;
-		/// <summary>
-		/// Creates an instance of the <see cref="ArrayPool{T}" /> class with the default maximum list size and bucket capacity.
-		/// </summary>
-		public ArrayPool() : this(0x40000000, 256) { }
-		/// <summary>
-		/// Creates an instance of the <see cref="ArrayPool{T}" /> class.
-		/// </summary>
-		/// <param name="maxSize">The maximum size of the arrays in the pool.</param>
-		/// <param name="capacityPerBucket">The capacity of each bucket. The pool groups arrays of similar sizes into buckets for faster access.</param>
-		public ArrayPool(int maxSize, int capacityPerBucket) {
-			if (maxSize < 16) maxSize = 16;
-			int num = GetID(maxSize) + 1;
-			_buckets = new Bucket[num];
-			for (int i = 0; i < num; i++) {
-				_buckets[i] = new Bucket(GetSize(i), capacityPerBucket);
-			}
-		}
-		/// <summary>
-		/// Rents an array that is at least the specified size from the pool.
-		/// </summary>
-		/// <param name="size">The minimum size of the array.</param>
-		/// <returns>An array of type <see cref="T" /> that is at least the specified size.</returns>
-		public T[] Rent(int size) {
-			int len2 = size;
-			if (len2 < 16) len2 = 16;
-			var arr = _buckets[GetID(len2)].Rent();
-			return arr;
-		}
-		/// <summary>
-		/// Returns a rented array to the pool.
-		/// </summary>
-		/// <param name="arr">The array to return.</param>
-		public void Return(T[] arr) {
-			int len2 = arr.Length;
-			if (len2 < 16) len2 = 16;
-			_buckets[GetID(len2)].Return(arr);
-		}
-		static int GetID(int size) {
-			size -= 1;
-			size >>= 4;
-			int num = 0;
-			for (; size != 0; size >>= 1) num++;
-			return num;
-		}
-		static int GetSize(int id) {
-			return 0x10 << id;
-		}
-	}
-}

Assets/Cryville/Common/Buffers/CategorizedPool.cs

@@ -1,90 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A set of resource pools categorized by a category type.
-	/// </summary>
-	/// <typeparam name="TCategory">The category type.</typeparam>
-	/// <typeparam name="TObject">The type of the objects in the pool.</typeparam>
-	public abstract class CategorizedPool<TCategory, TObject> where TObject : class {
-		/// <summary>
-		/// The set of underlying pools.
-		/// </summary>
-		/// <remarks>
-		/// <para>The <see cref="Rent(TCategory)" /> and <see cref="Return(TCategory, TObject)" /> method select an underlying pool directly from this set with the category as the key. When overridden, this set must be available since construction.</para>
-		/// </remarks>
-		protected abstract IReadOnlyDictionary<TCategory, ObjectPool<TObject>> Buckets { get; }
-		/// <summary>
-		/// The count of objects rented from the set of pools.
-		/// </summary>
-		public int RentedCount { get; private set; }
-		/// <summary>
-		/// Rents an object from the pool.
-		/// </summary>
-		/// <param name="category">The category.</param>
-		/// <returns>The rented object.</returns>
-		public TObject Rent(TCategory category) {
-			var obj = Buckets[category].Rent();
-			RentedCount++;
-			return obj;
-		}
-		/// <summary>
-		/// Returns a rented object to the pool.
-		/// </summary>
-		/// <param name="category">The category.</param>
-		/// <param name="obj">The object to return.</param>
-		public void Return(TCategory category, TObject obj) {
-			Buckets[category].Return(obj);
-			--RentedCount;
-		}
-	}
-	/// <summary>
-	/// A utility to access a categorized pool, representing a single unit that uses a shared categorized pool.
-	/// </summary>
-	/// <typeparam name="TCategory">The category type.</typeparam>
-	/// <typeparam name="TObject">The type of the objects in the pool.</typeparam>
-	public class CategorizedPoolAccessor<TCategory, TObject> where TObject : class {
-		readonly CategorizedPool<TCategory, TObject> _pool;
-		static readonly SimpleObjectPool<Dictionary<TObject, TCategory>> _dictPool
-			= new SimpleObjectPool<Dictionary<TObject, TCategory>>(1024);
-		Dictionary<TObject, TCategory> _rented;
-		/// <summary>
-		/// Creates an instance of the <see cref="CategorizedPoolAccessor{TCategory, TObject}" /> class.
-		/// </summary>
-		/// <param name="pool">The categorized pool.</param>
-		public CategorizedPoolAccessor(CategorizedPool<TCategory, TObject> pool) {
-			_pool = pool;
-		}
-		/// <summary>
-		/// Rents an object from the pool.
-		/// </summary>
-		/// <param name="category">The category.</param>
-		/// <returns>The rented object.</returns>
-		public TObject Rent(TCategory category) {
-			var obj = _pool.Rent(category);
-			if (_rented == null) _rented = _dictPool.Rent();
-			_rented.Add(obj, category);
-			return obj;
-		}
-		/// <summary>
-		/// Returns a rented object to the pool.
-		/// </summary>
-		/// <param name="obj">The object to return.</param>
-		public void Return(TObject obj) {
-			_pool.Return(_rented[obj], obj);
-			_rented.Remove(obj);
-		}
-		/// <summary>
-		/// Returns all objects rented by this accessor to the pool.
-		/// </summary>
-		public void ReturnAll() {
-			if (_rented == null) return;
-			foreach (var obj in _rented) {
-				_pool.Return(obj.Value, obj.Key);
-			}
-			_rented.Clear();
-			_dictPool.Return(_rented);
-			_rented = null;
-		}
-	}
-}

Assets/Cryville/Common/Buffers/ListPool.cs

@@ -1,71 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of lists of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The item type of the lists in the pool.</typeparam>
-	public class ListPool<T> {
-		private class Bucket : ObjectPool<List<T>> {
-			readonly int _size;
-			public Bucket(int size, int capacity) : base(capacity) {
-				_size = size;
-			}
-			protected override List<T> Construct() {
-				return new List<T>(_size);
-			}
-		}
-		readonly Bucket[] _buckets;
-		/// <summary>
-		/// Creates an instance of the <see cref="ListPool{T}" /> class with the default maximum list size and bucket capacity.
-		/// </summary>
-		public ListPool() : this(0x40000000, 256) { }
-		/// <summary>
-		/// Creates an instance of the <see cref="ListPool{T}" /> class.
-		/// </summary>
-		/// <param name="maxSize">The maximum size of the lists in the pool.</param>
-		/// <param name="capacityPerBucket">The capacity of each bucket. The pool groups lists of similar sizes into buckets for faster access.</param>
-		public ListPool(int maxSize, int capacityPerBucket) {
-			if (maxSize < 16) maxSize = 16;
-			int num = GetID(maxSize) + 1;
-			_buckets = new Bucket[num];
-			for (int i = 0; i < num; i++) {
-				_buckets[i] = new Bucket(GetSize(i), capacityPerBucket);
-			}
-		}
-		/// <summary>
-		/// Rents a list of the specified size from the pool. The size of the list must not be changed when it is rented.
-		/// </summary>
-		/// <param name="size">The size of the list.</param>
-		/// <returns>A <see cref="List{T}" /> of the specified size.</returns>
-		public List<T> Rent(int size) {
-			int len2 = size;
-			if (len2 < 16) len2 = 16;
-			var list = _buckets[GetID(len2)].Rent();
-			if (list.Count < size)
-				for (int i = list.Count; i < size; i++) list.Add(default(T));
-			else if (list.Count > size)
-				list.RemoveRange(size, list.Count - size);
-			return list;
-		}
-		/// <summary>
-		/// Returns a rented list to the pool.
-		/// </summary>
-		/// <param name="list">The list to return.</param>
-		public void Return(List<T> list) {
-			int len2 = list.Capacity;
-			if (len2 < 16) len2 = 16;
-			_buckets[GetID(len2)].Return(list);
-		}
-		static int GetID(int size) {
-			size -= 1;
-			size >>= 4;
-			int num = 0;
-			for (; size != 0; size >>= 1) num++;
-			return num;
-		}
-		static int GetSize(int id) {
-			return 0x10 << id;
-		}
-	}
-}

Assets/Cryville/Common/Buffers/ObjectPool.cs

@@ -1,52 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of type <typeparamref name="T" />.
-	/// </summary>
-	/// <typeparam name="T">The type of the objects in the pool.</typeparam>
-	public abstract class ObjectPool<T> where T : class {
-		int _index;
-		readonly T[] _objs;
-		/// <summary>
-		/// Creates an instance of the <see cref="ObjectPool{T}" /> class.
-		/// </summary>
-		/// <param name="capacity">The capacity of the pool.</param>
-		public ObjectPool(int capacity) {
-			_objs = new T[capacity];
-		}
-		/// <summary>
-		/// The count of objects rented from the pool.
-		/// </summary>
-		public int RentedCount { get { return _index; } }
-		/// <summary>
-		/// Rents a object from the pool.
-		/// </summary>
-		/// <returns>The rented object.</returns>
-		public T Rent() {
-			T obj = null;
-			if (_index < _objs.Length) {
-				obj = _objs[_index];
-				_objs[_index++] = null;
-			}
-			if (obj == null) obj = Construct();
-			else Reset(obj);
-			return obj;
-		}
-		/// <summary>
-		/// Returns a rented object to the pool.
-		/// </summary>
-		/// <param name="obj">The object to return.</param>
-		public void Return(T obj) {
-			if (_index > 0) _objs[--_index] = obj;
-		}
-		/// <summary>
-		/// Constructs a new instance of type <typeparamref name="T" />.
-		/// </summary>
-		/// <returns>The new instance.</returns>
-		protected abstract T Construct();
-		/// <summary>
-		/// Resets an object.
-		/// </summary>
-		/// <param name="obj">The object.</param>
-		protected virtual void Reset(T obj) { }
-	}
-}

Assets/Cryville/Common/Buffers/SimpleObjectPool.cs

@@ -1,16 +0,0 @@
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// A resource pool that allows reusing instances of type <typeparamref name="T" />, which has a parameterless constructor.
-	/// </summary>
-	/// <typeparam name="T">The type of the objects in the pool.</typeparam>
-	public class SimpleObjectPool<T> : ObjectPool<T> where T : class, new() {
-		/// <summary>
-		/// Creates an instance of the <see cref="SimpleObjectPool{T}" /> class.
-		/// </summary>
-		/// <param name="capacity">The capacity of the pool.</param>
-		public SimpleObjectPool(int capacity) : base(capacity) { }
-		protected override T Construct() {
-			return new T();
-		}
-	}
-}

Assets/Cryville/Common/Buffers/SimpleObjectPool.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b8cd439340f088d4eb83711a5bc6384d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Buffers/TargetString.cs

@@ -1,135 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Cryville.Common.Buffers {
-	/// <summary>
-	/// An auto-resized <see cref="char" /> array as a variable-length string used as a target that is modified frequently.
-	/// </summary>
-	public class TargetString : IEnumerable<char> {
-		public event Action OnUpdate;
-		char[] _arr;
-		bool _invalidated;
-		/// <summary>
-		/// Creates an instance of the <see cref="TargetString" /> class with a capacity of 16.
-		/// </summary>
-		public TargetString() : this(16) { }
-		/// <summary>
-		/// Creates an instance of the <see cref="TargetString" /> class.
-		/// </summary>
-		/// <param name="capacity">The initial capacity of the string.</param>
-		/// <exception cref="ArgumentOutOfRangeException"><paramref name="capacity" /> is less than or equal to 0.</exception>
-		public TargetString(int capacity) {
-			if (capacity <= 0) throw new ArgumentOutOfRangeException("capacity");
-			_arr = new char[capacity];
-		}
-		/// <summary>
-		/// Gets or sets one of the characters in the string.
-		/// </summary>
-		/// <param name="index">The zero-based index of the character.</param>
-		/// <returns>The character at the given index.</returns>
-		/// <exception cref="ArgumentOutOfRangeException"><paramref name="index" /> is less than 0 or not less than <see cref="Length" />.</exception>
-		/// <remarks>
-		/// <para>Set <see cref="Length" /> to a desired value before updating the characters.</para>
-		/// <para>Call <see cref=" Validate" /> after all the characters are updated.</para>
-		/// </remarks>
-		public char this[int index] {
-			get {
-				if (index < 0 || index >= m_length)
-					throw new ArgumentOutOfRangeException("index");
-				return _arr[index];
-			}
-			set {
-				if (index < 0 || index >= m_length)
-					throw new ArgumentOutOfRangeException("index");
-				if (_arr[index] == value) return;
-				_arr[index] = value;
-				_invalidated = true;
-			}
-		}
-		int m_length;
-		/// <summary>
-		/// The length of the string.
-		/// </summary>
-		/// <exception cref="ArgumentOutOfRangeException">The value specified for a set operation is less than 0.</exception>
-		public int Length {
-			get {
-				return m_length;
-			}
-			set {
-				if (Length < 0) throw new ArgumentOutOfRangeException("length");
-				if (m_length == value) return;
-				if (_arr.Length < value) {
-					var len = _arr.Length;
-					while (len < value) len *= 2;
-					var arr2 = new char[len];
-					Array.Copy(_arr, arr2, m_length);
-					_arr = arr2;
-				}
-				m_length = value;
-				_invalidated = true;
-			}
-		}
-		/// <summary>
-		/// Validates the string.
-		/// </summary>
-		public void Validate() {
-			if (!_invalidated) return;
-			_invalidated = false;
-			var ev = OnUpdate;
-			if (ev != null) ev.Invoke();
-		}
-		internal char[] TrustedAsArray() { return _arr; }
-
-		/// <summary>
-		/// Returns an enumerator that iterates through the <see cref="TargetString" />.
-		/// </summary>
-		/// <returns>A <see cref="Enumerator" /> for the <see cref="TargetString" />.</returns>
-		public Enumerator GetEnumerator() {
-			return new Enumerator(this);
-		}
-		IEnumerator<char> IEnumerable<char>.GetEnumerator() {
-			return new Enumerator(this);
-		}
-		IEnumerator IEnumerable.GetEnumerator() {
-			return new Enumerator(this);
-		}
-
-		public struct Enumerator : IEnumerator<char> {
-			readonly TargetString _self;
-			int _index;
-			internal Enumerator(TargetString self) {
-				_self = self;
-				_index = -1;
-			}
-
-			public char Current {
-				get {
-					if (_index < 0)
-						throw new InvalidOperationException(_index == -1 ? "Enum not started" : "Enum ended");
-					return _self[_index];
-				}
-			}
-
-			object IEnumerator.Current { get { return Current; } }
-
-			public void Dispose() {
-				_index = -2;
-			}
-
-			public bool MoveNext() {
-				if (_index == -2) return false;
-				_index++;
-				if (_index >= _self.Length) {
-					_index = -2;
-					return false;
-				}
-				return true;
-			}
-
-			public void Reset() {
-				_index = -1;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Buffers/TargetString.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f0fc34ac257793d4883a9cfcdb6941b9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Collections/Generic/IPairList.cs

@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cryville.Common.Collections.Generic {
-	public interface IPairList<TKey, TValue> : IList<KeyValuePair<TKey, TValue>> {
-		void Add(TKey key, TValue value);
-		void Insert(int index, TKey key, TValue value);
-	}
-}

Assets/Cryville/Common/Collections/Generic/IPairList.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 73fb17b484b343242bcce27c15ed7d44
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Collections/Generic/PairCollection.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Cryville.Common.Collections.Generic {
-	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairCollectionDebugView<,>))]
-	public struct PairCollection<TKey, TValue> : IDisposable {
-		public void Dispose() { }
-		readonly IPairList<TKey, TValue> _pairList;
-		readonly IDictionary<TKey, TValue> _dictionary;
-		public PairCollection(object collection) : this() {
-			var type = collection.GetType();
-			if (typeof(IPairList<TKey, TValue>).IsAssignableFrom(type)) _pairList = (IPairList<TKey, TValue>)collection;
-			else if (typeof(IDictionary<TKey, TValue>).IsAssignableFrom(type)) _dictionary = (IDictionary<TKey, TValue>)collection;
-			else throw new ArgumentException("Parameter is not a pair collection");
-		}
-		public int Count {
-			get {
-				if (_pairList != null) return _pairList.Count;
-				else return _dictionary.Count;
-			}
-		}
-		public void Add(TKey key, TValue value) {
-			if (_pairList != null) _pairList.Add(key, value);
-			else _dictionary.Add(key, value);
-		}
-		public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index) {
-			if (_pairList != null) _pairList.CopyTo(array, index);
-			else _dictionary.CopyTo(array, index);
-		}
-	}
-	internal class PairCollectionDebugView<TKey, TValue> {
-		readonly PairCollection<TKey, TValue> _self;
-		public PairCollectionDebugView(PairCollection<TKey, TValue> self) {
-			_self = self;
-		}
-		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-		public KeyValuePair<TKey, TValue>[] Items {
-			get {
-				KeyValuePair<TKey, TValue>[] array = new KeyValuePair<TKey, TValue>[_self.Count];
-				_self.CopyTo(array, 0);
-				return array;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Collections/Generic/PairCollection.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2517e8f040bd36f46948e5fafaf5335c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Collections/Generic/PairList.cs

@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Cryville.Common.Collections.Generic {
-	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairListDebugView<,>))]
-	public class PairList<TKey, TValue> : List<KeyValuePair<TKey, TValue>>, IPairList<TKey, TValue>, IPairList {
-		public void Add(TKey key, TValue value) {
-			Add(new KeyValuePair<TKey, TValue>(key, value));
-		}
-
-		public void Add(object key, object value) {
-			try {
-				Add((TKey)key, (TValue)value);
-			}
-			catch (InvalidCastException) {
-				throw new ArgumentException("Wrong key type or value type");
-			}
-		}
-
-		public void Insert(int index, TKey key, TValue value) {
-			Insert(index, new KeyValuePair<TKey, TValue>(key, value));
-		}
-
-		public void Insert(int index, object key, object value) {
-			try {
-				Insert(index, (TKey)key, (TValue)value);
-			}
-			catch (InvalidCastException) {
-				throw new ArgumentException("Wrong key type or value type");
-			}
-		}
-	}
-	internal class PairListDebugView<TKey, TValue> {
-		readonly PairList<TKey, TValue> _self;
-		public PairListDebugView(PairList<TKey, TValue> self) {
-			_self = self;
-		}
-		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-		public KeyValuePair<TKey, TValue>[] Items {
-			get {
-				KeyValuePair<TKey, TValue>[] array = new KeyValuePair<TKey, TValue>[_self.Count];
-				_self.CopyTo(array, 0);
-				return array;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Collections/Generic/PairList.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d9ed5ea8b7b1a934287e7ec5971166c0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Collections/IPairList.cs

@@ -1,8 +0,0 @@
-using System.Collections;
-
-namespace Cryville.Common.Collections {
-	public interface IPairList : IList {
-		void Add(object key, object value);
-		void Insert(int index, object key, object value);
-	}
-}

Assets/Cryville/Common/Collections/IPairList.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 046617672d437de4ab7e644a55defd3b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Collections/PairCollection.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Cryville.Common.Collections {
-	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairCollectionDebugView))]
-	public struct PairCollection : IDisposable {
-		public void Dispose() { }
-		readonly IPairList _pairList;
-		readonly IDictionary _dictionary;
-		public PairCollection(object collection) : this() {
-			var type = collection.GetType();
-			if (typeof(IPairList).IsAssignableFrom(type)) _pairList = (IPairList)collection;
-			else if (typeof(IDictionary).IsAssignableFrom(type)) _dictionary = (IDictionary)collection;
-			else throw new ArgumentException("Parameter is not a pair collection");
-		}
-		public int Count {
-			get {
-				if (_pairList != null) return _pairList.Count;
-				else return _dictionary.Count;
-			}
-		}
-		public void Add(object key, object value) {
-			if (_pairList != null) _pairList.Add(key, value);
-			else _dictionary.Add(key, value);
-		}
-		public void CopyTo(KeyValuePair<object, object>[] array, int index) {
-			if (_pairList != null) _pairList.CopyTo(array, index);
-			else _dictionary.CopyTo(array, index);
-		}
-	}
-	internal class PairCollectionDebugView {
-		readonly PairCollection _self;
-		public PairCollectionDebugView(PairCollection self) {
-			_self = self;
-		}
-		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-		public KeyValuePair<object, object>[] Items {
-			get {
-				KeyValuePair<object, object>[] array = new KeyValuePair<object, object>[_self.Count];
-				_self.CopyTo(array, 0);
-				return array;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Collections/PairCollection.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1f87dfb8f6a1f5640b6deae741cd715c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Collections/PairList.cs

@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Cryville.Common.Collections {
-	[DebuggerDisplay("Count = {Count}"), DebuggerTypeProxy(typeof(PairListDebugView))]
-	public class PairList : List<KeyValuePair<object, object>>, IPairList {
-		public void Add(object key, object value) {
-			Add(new KeyValuePair<object, object>(key, value));
-		}
-
-		public void Insert(int index, object key, object value) {
-			Insert(index, new KeyValuePair<object, object>(key, value));
-		}
-	}
-	internal class PairListDebugView {
-		readonly PairList _self;
-		public PairListDebugView(PairList self) {
-			_self = self;
-		}
-		[DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-		public KeyValuePair<object, object>[] Items {
-			get {
-				KeyValuePair<object, object>[] array = new KeyValuePair<object, object>[_self.Count];
-				_self.CopyTo(array, 0);
-				return array;
-			}
-		}
-	}
-}

Assets/Cryville/Common/Collections/PairList.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 57fc9f037c1fda5449e2a365a835c82c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/ComponentModel/LogarithmicScaleAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]

Assets/Cryville/Common/ComponentModel/PrecisionAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, Inherited = false)]

Assets/Cryville/Common/ComponentModel/RangeAttribute.cs

@@ -1,14 +1,14 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
 	public class RangeAttribute : Attribute {
-		public RangeAttribute(float min, float max) {
+		public RangeAttribute(double min, double max) {
 			Min = min;
 			Max = max;
 		}
 
-		public float Min { get; set; }
-		public float Max { get; set; }
+		public double Min { get; set; }
+		public double Max { get; set; }
 	}
 }

Assets/Cryville/Common/ComponentModel/StepAttribute.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 
 namespace Cryville.Common.ComponentModel {
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
 	public class StepAttribute : Attribute {
-		public StepAttribute(float step) {
+		public StepAttribute(double step) {
 			Step = step;
 		}
-		public float Step { get; set; }
+		public double Step { get; set; }
 	}
 }

Assets/Cryville/Common/Coroutine.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace Cryville.Common {
+	public class Coroutine {
+		readonly IEnumerator<float> _enumerator;
+		readonly Stopwatch _stopwatch = new();
+		public float Progress { get; private set; }
+		public Coroutine(IEnumerator<float> enumerator) {
+			_enumerator = enumerator;
+		}
+		public bool TickOnce() {
+			if (!_enumerator.MoveNext()) return false;
+			Progress = _enumerator.Current;
+			return true;
+		}
+		public bool Tick(double minTime) {
+			_stopwatch.Restart();
+			while (_stopwatch.Elapsed.TotalSeconds < minTime) {
+				if (!_enumerator.MoveNext()) return false;
+				Progress = _enumerator.Current;
+			}
+			return true;
+		}
+	}
+}

Assets/Cryville/Common/Coroutine.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: df66519fa93e1b94ea5bb1702cc91b3f
+guid: 387adc7d494be0147b7cb930bc2e726b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/Culture/ScriptUtils.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Cryville.Common.Culture {
-	public static class ScriptUtils {
-		public static string[] Scripts = new string[] { "adlm", "afak", "aghb", "ahom", "arab", "aran", "armi", "armn", "avst", "bali", "bamu", "bass", "batk", "beng", "bhks", "blis", "bopo", "brah", "brai", "bugi", "buhd", "cakm", "cans", "cari", "cham", "cher", "chrs", "cirt", "copt", "cpmn", "cprt", "cyrl", "cyrs", "deva", "diak", "dogr", "dsrt", "dupl", "egyd", "egyh", "egyp", "elba", "elym", "ethi", "geok", "geor", "glag", "gong", "gonm", "goth", "gran", "grek", "gujr", "guru", "hanb", "hang", "hani", "hano", "hans", "hant", "hatr", "hebr", "hira", "hluw", "hmng", "hmnp", "hrkt", "hung", "inds", "ital", "jamo", "java", "jpan", "jurc", "kali", "kana", "khar", "khmr", "khoj", "kitl", "kits", "knda", "kore", "kpel", "kthi", "lana", "laoo", "latf", "latg", "latn", "leke", "lepc", "limb", "lina", "linb", "lisu", "loma", "lyci", "lydi", "mahj", "maka", "mand", "mani", "marc", "maya", "medf", "mend", "merc", "mero", "mlym", "modi", "mong", "moon", "mroo", "mtei", "mult", "mymr", "nand", "narb", "nbat", "newa", "nkdb", "nkgb", "nkoo", "nshu", "ogam", "olck", "orkh", "orya", "osge", "osma", "ougr", "palm", "pauc", "pcun", "pelm", "perm", "phag", "phli", "phlp", "phlv", "phnx", "piqd", "plrd", "prti", "psin", "qaaa", "qaai", "qabx", "ranj", "rjng", "rohg", "roro", "runr", "samr", "sara", "sarb", "saur", "sgnw", "shaw", "shrd", "shui", "sidd", "sind", "sinh", "sogd", "sogo", "sora", "soyo", "sund", "sylo", "syrc", "syre", "syrj", "syrn", "tagb", "takr", "tale", "talu", "taml", "tang", "tavt", "telu", "teng", "tfng", "tglg", "thaa", "thai", "tibt", "tirh", "toto", "ugar", "vaii", "visp", "wara", "wcho", "wole", "xpeo", "xsux", "yezi", "yiii", "zanb", "zinh", "zmth", "zsye", "zsym", "zxxx", "zyyy", "zzzz", };
-		public static string UltimateFallbackScript = "zyyy";
-		public static Dictionary<string, string[]> FallbackScriptMap = new Dictionary<string, string[]> {
-			{ "aran", new string[] { "arab" } }, { "cyrs", new string[] { "cyrl" } },
-			{ "hanb", new string[] { "hant", "bopo" } }, { "hans", new string[] { "hani" } }, { "hant", new string[] { "hani" } },
-			{ "hrkt", new string[] { "hira", "kana" } }, { "jpan", new string[] { "hani", "hira", "kana" } },
-			{ "jamo", new string[] { "hang" } }, { "kore", new string[] { "hang", "hani" } },
-			{ "latf", new string[] { "latn" } }, { "latg", new string[] { "latn" } },
-			{ "syre", new string[] { "syrc" } }, { "syrj", new string[] { "syrc" } }, { "syrn", new string[] { "syrc" } },
-			{ "zsye", new string[] { "zsym" } },
-		};
-		public static void FillKeysWithScripts(IDictionary dict, Func<object> value) {
-			foreach (var s in Scripts) dict.Add(s, value());
-		}
-		public static IEnumerable<string> EnumerateFallbackScripts(string script) {
-			if (string.IsNullOrEmpty(script)) throw new ArgumentNullException("script");
-			script = script.ToLower();
-			if (script == UltimateFallbackScript) {
-				yield return null;
-				yield break;
-			}
-			string[] fblist;
-			if (FallbackScriptMap.TryGetValue(script, out fblist)) {
-				foreach (var fb in fblist) {
-					yield return fb;
-				}
-			}
-			else yield return UltimateFallbackScript;
-		}
-	}
-}

Assets/Cryville/Common/Culture/ScriptUtils.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ae9dab8f520fadc4194032f523ca87c1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/FileStringAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	public class FileStringAttribute : Attribute {

Assets/Cryville/Common/Font/FontFile.cs

@@ -1,4 +1,4 @@
-using Cryville.Common.IO;
+using Cryville.Common.IO;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -16,13 +16,11 @@ namespace Cryville.Common.Font {
 		}
 		public void Close() { Reader.Close(); }
 
-		public static FontFile Create(FileInfo file) {
-			switch (file.Extension) {
-				case ".ttf": case ".otf": return new FontFileTTF(file);
-				case ".ttc": case ".otc": return new FontFileTTC(file);
-				default: return null;
-			}
-		}
+		public static FontFile Create(FileInfo file) => file.Extension switch {
+			".ttf" or ".otf" => new FontFileTTF(file),
+			".ttc" or ".otc" => new FontFileTTC(file),
+			_ => null,
+		};
 
 		public Enumerator GetEnumerator() {
 			return new Enumerator(this);
@@ -42,7 +40,7 @@ namespace Cryville.Common.Font {
 				_index = -1;
 			}
 
-			public Typeface Current {
+			public readonly Typeface Current {
 				get {
 					if (_index < 0)
 						throw new InvalidOperationException(_index == -1 ? "Enum not started" : "Enum ended");
@@ -50,7 +48,7 @@ namespace Cryville.Common.Font {
 				}
 			}
 
-			object IEnumerator.Current { get { return Current; } }
+			readonly object IEnumerator.Current => Current;
 
 			public void Dispose() {
 				_index = -2;

Assets/Cryville/Common/Font/FontManager.cs

@@ -1,27 +1,28 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
 namespace Cryville.Common.Font {
 	public abstract class FontManager {
-		public IReadOnlyDictionary<string, IReadOnlyCollection<Typeface>> MapFullNameToTypeface { get; private set; }
+		public IReadOnlyDictionary<string, Typeface> MapFullNameToTypeface { get; private set; }
 		public IReadOnlyDictionary<string, IReadOnlyCollection<Typeface>> MapNameToTypefaces { get; private set; }
 		public FontManager() {
-			var map1 = new Dictionary<string, List<Typeface>>();
+			var map1 = new Dictionary<string, Typeface>();
 			var map2 = new Dictionary<string, List<Typeface>>();
 			foreach (var f in EnumerateAllTypefaces()) {
-				List<Typeface> set1;
-				if (!map1.TryGetValue(f.FullName, out set1)) {
-					map1.Add(f.FullName, set1 = new List<Typeface>());
+				if (!map1.ContainsKey(f.FullName)) {
+					map1.Add(f.FullName, f);
 				}
-				set1.Add(f);
-				List<Typeface> set2;
-				if (!map2.TryGetValue(f.FamilyName, out set2)) {
+				else {
+					Shared.Logger.Log(3, "UI", "Discarding a font with a duplicate full name {0}", f.FullName);
+					continue;
+				}
+				if (!map2.TryGetValue(f.FamilyName, out List<Typeface> set2)) {
 					map2.Add(f.FamilyName, set2 = new List<Typeface>());
 				}
 				set2.Add(f);
 			}
-			MapFullNameToTypeface = map1.ToDictionary(i => i.Key, i => (IReadOnlyCollection<Typeface>)i.Value);
+			MapFullNameToTypeface = map1;
 			MapNameToTypefaces = map2.ToDictionary(i => i.Key, i => (IReadOnlyCollection<Typeface>)i.Value);
 		}
 		protected abstract IEnumerable<Typeface> EnumerateAllTypefaces();

Assets/Cryville/Common/Font/FontMatcher.cs

@@ -1,4 +1,4 @@
-using Cryville.Common.Culture;
+using Cryville.Culture;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6,323 +6,339 @@ using System.Linq;
 namespace Cryville.Common.Font {
 	public abstract class FontMatcher {
 		protected FontManager Manager { get; private set; }
-		public FontMatcher(FontManager manafer) { Manager = manafer; }
-		public abstract IEnumerable<Typeface> MatchScript(string script = null, bool distinctFamily = false);
+		public FontMatcher(FontManager manager) { Manager = manager; }
+		public abstract IEnumerable<Typeface> MatchLanguage(LanguageId lang, bool distinctFamily = false);
 	}
 	public class FallbackListFontMatcher : FontMatcher {
-		public Dictionary<string, List<string>> MapScriptToTypefaces = new Dictionary<string, List<string>>();
-		public void LoadDefaultWindowsFallbackList() {
-			if (Environment.OSVersion.Platform != PlatformID.Win32NT) return;
-			MapScriptToTypefaces.Clear();
-			ScriptUtils.FillKeysWithScripts(MapScriptToTypefaces, () => new List<string>());
+		readonly LanguageMatching _matcher;
+		static readonly string UltimateFallbackScript = "zzzz";
+		public Dictionary<string, List<string>> MapScriptToTypefaces = new();
+		public static Dictionary<string, List<string>> GetDefaultWindowsFallbackMap() {
+			var map = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+			FillKeysWithScripts(map, () => new List<string>());
 			// Reference: https://github.com/chromium/chromium/blob/main/third_party/blink/renderer/platform/fonts/win/font_fallback_win.cc
-			MapScriptToTypefaces["zyyy"].Insert(0, "SimSun"); // Custom
-			MapScriptToTypefaces["zyyy"].Insert(0, "SimHei"); // Custom
-			MapScriptToTypefaces["zyyy"].Insert(0, "Microsoft YaHei"); // Custom
-			MapScriptToTypefaces["zyyy"].Insert(0, "Arial");
-			MapScriptToTypefaces["zyyy"].Insert(0, "Times New Roman");
-			MapScriptToTypefaces["zyyy"].Insert(0, "Segoe UI"); // Custom
-			MapScriptToTypefaces["arab"].Insert(0, "Tahoma");
-			MapScriptToTypefaces["cyrl"].Insert(0, "Times New Roman");
-			MapScriptToTypefaces["grek"].Insert(0, "Times New Roman");
-			MapScriptToTypefaces["hebr"].Insert(0, "David");
-			MapScriptToTypefaces["jpan"].Insert(0, "MS PGothic");
-			MapScriptToTypefaces["latn"].Insert(0, "Times New Roman");
-			MapScriptToTypefaces["hans"].Insert(0, "SimSun");
-			MapScriptToTypefaces["hans"].Insert(0, "SimHei"); // Custom
-			MapScriptToTypefaces["thai"].Insert(0, "Tahoma");
-			MapScriptToTypefaces["hans"].Insert(0, "PMingLiU");
+			map[UltimateFallbackScript].Insert(0, "SimSun"); // Custom
+			map[UltimateFallbackScript].Insert(0, "SimHei"); // Custom
+			map[UltimateFallbackScript].Insert(0, "Microsoft YaHei"); // Custom
+			map[UltimateFallbackScript].Insert(0, "Arial");
+			map[UltimateFallbackScript].Insert(0, "Times New Roman");
+			map[UltimateFallbackScript].Insert(0, "Segoe UI"); // Custom
+			map["arab"].Insert(0, "Tahoma");
+			map["cyrl"].Insert(0, "Times New Roman");
+			map["grek"].Insert(0, "Times New Roman");
+			map["hebr"].Insert(0, "David");
+			map["jpan"].Insert(0, "MS PGothic");
+			map["latn"].Insert(0, "Times New Roman");
+			map["hans"].Insert(0, "SimSun");
+			map["hans"].Insert(0, "SimHei"); // Custom
+			map["thai"].Insert(0, "Tahoma");
+			map["hans"].Insert(0, "PMingLiU");
 			// Reference: https://learn.microsoft.com/en-us/globalization/input/font-support
 			var ver = Environment.OSVersion.Version;
 			if (ver >= new Version(5, 0)) { // Windows 2000
-				MapScriptToTypefaces["armn"].Insert(0, "Sylfaen");
-				MapScriptToTypefaces["deva"].Insert(0, "Mangal");
-				MapScriptToTypefaces["geor"].Insert(0, "Sylfaen");
-				MapScriptToTypefaces["taml"].Insert(0, "Latha");
+				map["armn"].Insert(0, "Sylfaen");
+				map["deva"].Insert(0, "Mangal");
+				map["geor"].Insert(0, "Sylfaen");
+				map["taml"].Insert(0, "Latha");
 			}
 			if (ver >= new Version(5, 1)) { // Windows XP
-				MapScriptToTypefaces["gujr"].Insert(0, "Shruti");
-				MapScriptToTypefaces["guru"].Insert(0, "Raavi");
-				MapScriptToTypefaces["knda"].Insert(0, "Tunga");
-				MapScriptToTypefaces["syrc"].Insert(0, "Estrangelo Edessa");
-				MapScriptToTypefaces["telu"].Insert(0, "Gautami");
-				MapScriptToTypefaces["thaa"].Insert(0, "MV Boli");
+				map["gujr"].Insert(0, "Shruti");
+				map["guru"].Insert(0, "Raavi");
+				map["knda"].Insert(0, "Tunga");
+				map["syrc"].Insert(0, "Estrangelo Edessa");
+				map["telu"].Insert(0, "Gautami");
+				map["thaa"].Insert(0, "MV Boli");
 				// SP2
-				MapScriptToTypefaces["beng"].Insert(0, "Vrinda");
-				MapScriptToTypefaces["mlym"].Insert(0, "Kartika");
+				map["beng"].Insert(0, "Vrinda");
+				map["mlym"].Insert(0, "Kartika");
 			}
 			if (ver >= new Version(6, 0)) { // Windows Vista
-				MapScriptToTypefaces["cans"].Insert(0, "Euphemia");
-				MapScriptToTypefaces["cher"].Insert(0, "Plantagenet");
-				MapScriptToTypefaces["ethi"].Insert(0, "Nyala");
-				MapScriptToTypefaces["khmr"].Insert(0, "DaunPenh MoolBoran");
-				MapScriptToTypefaces["laoo"].Insert(0, "DokChampa");
-				MapScriptToTypefaces["mong"].Insert(0, "Mongolian Baiti");
-				MapScriptToTypefaces["orya"].Insert(0, "Kalinga");
-				MapScriptToTypefaces["sinh"].Insert(0, "Iskoola Pota");
-				MapScriptToTypefaces["tibt"].Insert(0, "Microsoft Himalaya");
-				MapScriptToTypefaces["yiii"].Insert(0, "Microsoft Yi Baiti");
-				MapScriptToTypefaces["arab"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["cyrl"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["grek"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["latn"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["hans"].Add("SimSun-ExtB");
-				MapScriptToTypefaces["hant"].Add("MingLiU-ExtB");
-				MapScriptToTypefaces["hant"].Add("MingLiU_HKSCS-ExtB");
-				MapScriptToTypefaces["arab"].Add("Microsoft Uighur");
-				MapScriptToTypefaces["zmth"].Insert(0, "Cambria Math");
+				map["cans"].Insert(0, "Euphemia");
+				map["cher"].Insert(0, "Plantagenet");
+				map["ethi"].Insert(0, "Nyala");
+				map["khmr"].Insert(0, "DaunPenh MoolBoran");
+				map["kore"].Insert(0, "Malgun Gothic"); // Reference: https://en.wikipedia.org/wiki/List_of_typefaces_included_with_Microsoft_Windows
+				map["laoo"].Insert(0, "DokChampa");
+				map["mong"].Insert(0, "Mongolian Baiti");
+				map["orya"].Insert(0, "Kalinga");
+				map["sinh"].Insert(0, "Iskoola Pota");
+				map["tibt"].Insert(0, "Microsoft Himalaya");
+				map["yiii"].Insert(0, "Microsoft Yi Baiti");
+				map["arab"].Insert(0, "Segoe UI");
+				map["cyrl"].Insert(0, "Segoe UI");
+				map["grek"].Insert(0, "Segoe UI");
+				map["latn"].Insert(0, "Segoe UI");
+				map["hans"].Add("SimSun-ExtB");
+				map["hant"].Add("MingLiU-ExtB");
+				map["hant"].Add("MingLiU_HKSCS-ExtB");
+				map["arab"].Add("Microsoft Uighur");
+				map["zmth"].Insert(0, "Cambria Math");
 				// Reference: https://en.wikipedia.org/wiki/List_of_CJK_fonts
-				MapScriptToTypefaces["jpan"].Insert(0, "Meiryo");
-				MapScriptToTypefaces["hans"].Insert(0, "Microsoft YaHei");
+				map["jpan"].Insert(0, "Meiryo");
+				map["hans"].Insert(0, "Microsoft YaHei");
 			}
 			if (ver >= new Version(6, 1)) { // Windows 7
-				MapScriptToTypefaces["brai"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["dsrt"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["talu"].Insert(0, "Microsoft New Tai Lue");
-				MapScriptToTypefaces["ogam"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["osma"].Insert(0, "Ebrima");
-				MapScriptToTypefaces["phag"].Insert(0, "Microsoft PhagsPa");
-				MapScriptToTypefaces["runr"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["zsym"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["tale"].Insert(0, "Microsoft Tai Le");
-				MapScriptToTypefaces["tfng"].Insert(0, "Ebrima");
-				MapScriptToTypefaces["vaii"].Insert(0, "Ebrima");
+				map["brai"].Insert(0, "Segoe UI Symbol");
+				map["dsrt"].Insert(0, "Segoe UI Symbol");
+				map["talu"].Insert(0, "Microsoft New Tai Lue");
+				map["ogam"].Insert(0, "Segoe UI Symbol");
+				map["osma"].Insert(0, "Ebrima");
+				map["phag"].Insert(0, "Microsoft PhagsPa");
+				map["runr"].Insert(0, "Segoe UI Symbol");
+				map["zsym"].Insert(0, "Segoe UI Symbol");
+				map["tale"].Insert(0, "Microsoft Tai Le");
+				map["tfng"].Insert(0, "Ebrima");
+				map["vaii"].Insert(0, "Ebrima");
 			}
 			if (ver >= new Version(6, 2)) { // Windows 8
-				MapScriptToTypefaces["glag"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["goth"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["hang"].Add("Malgun Gothic");
-				MapScriptToTypefaces["ital"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["lisu"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["mymr"].Insert(0, "Myanmar Text");
-				MapScriptToTypefaces["nkoo"].Insert(0, "Ebrima");
-				MapScriptToTypefaces["orkh"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["ethi"].Insert(0, "Ebrima");
-				MapScriptToTypefaces["cans"].Insert(0, "Gadugi");
-				MapScriptToTypefaces["hant"].Insert(0, "Microsoft JhengHei UI");
-				MapScriptToTypefaces["hans"].Insert(0, "Microsoft YaHei UI");
-				MapScriptToTypefaces["beng"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["deva"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["gujr"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["guru"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
-				MapScriptToTypefaces["knda"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
-				MapScriptToTypefaces["mlym"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["orya"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["sinh"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
-				MapScriptToTypefaces["taml"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
-				MapScriptToTypefaces["telu"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["armn"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["geor"].Insert(0, "Segoe UI");
-				MapScriptToTypefaces["hebr"].Insert(0, "Segoe UI");
+				map["glag"].Insert(0, "Segoe UI Symbol");
+				map["goth"].Insert(0, "Segoe UI Symbol");
+				map["hang"].Add("Malgun Gothic");
+				map["ital"].Insert(0, "Segoe UI Symbol");
+				map["lisu"].Insert(0, "Segoe UI");
+				map["mymr"].Insert(0, "Myanmar Text");
+				map["nkoo"].Insert(0, "Ebrima");
+				map["orkh"].Insert(0, "Segoe UI Symbol");
+				map["ethi"].Insert(0, "Ebrima");
+				map["cans"].Insert(0, "Gadugi");
+				map["hant"].Insert(0, "Microsoft JhengHei UI");
+				map["hans"].Insert(0, "Microsoft YaHei UI");
+				map["beng"].Insert(0, "Nirmala UI");
+				map["deva"].Insert(0, "Nirmala UI");
+				map["gujr"].Insert(0, "Nirmala UI");
+				map["guru"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				map["knda"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				map["mlym"].Insert(0, "Nirmala UI");
+				map["orya"].Insert(0, "Nirmala UI");
+				map["sinh"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				map["taml"].Insert(0, "Nirmala UI"); // NOT DOCUMENTED, UNVERIFIED
+				map["telu"].Insert(0, "Nirmala UI");
+				map["armn"].Insert(0, "Segoe UI");
+				map["geor"].Insert(0, "Segoe UI");
+				map["hebr"].Insert(0, "Segoe UI");
 			}
 			if (ver >= new Version(6, 3)) { // Windows 8.1
-				MapScriptToTypefaces["bugi"].Insert(0, "Leelawadee UI");
-				MapScriptToTypefaces["copt"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["java"].Insert(0, "Javanese Text");
-				MapScriptToTypefaces["merc"].Insert(0, "Segoe UI Symbol");
-				MapScriptToTypefaces["olck"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["sora"].Insert(0, "Nirmala UI");
-				MapScriptToTypefaces["khmr"].Insert(0, "Leelawadee UI");
-				MapScriptToTypefaces["laoo"].Insert(0, "Leelawadee UI");
-				MapScriptToTypefaces["thai"].Insert(0, "Leelawadee UI");
-				MapScriptToTypefaces["zsye"].Insert(0, "Segoe UI Emoji");
+				map["bugi"].Insert(0, "Leelawadee UI");
+				map["copt"].Insert(0, "Segoe UI Symbol");
+				map["java"].Insert(0, "Javanese Text");
+				map["merc"].Insert(0, "Segoe UI Symbol");
+				map["olck"].Insert(0, "Nirmala UI");
+				map["sora"].Insert(0, "Nirmala UI");
+				map["khmr"].Insert(0, "Leelawadee UI");
+				map["laoo"].Insert(0, "Leelawadee UI");
+				map["thai"].Insert(0, "Leelawadee UI");
+				map["zsye"].Insert(0, "Segoe UI Emoji");
 			}
 			if (ver >= new Version(10, 0)) { // Windows 10
-				MapScriptToTypefaces["brah"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["cari"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["cprt"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["egyp"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["armi"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["phli"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["prti"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["khar"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["lyci"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["lydi"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["phnx"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["xpeo"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["sarb"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["shaw"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["xsux"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["ugar"].Insert(0, "Segoe UI Historic");
+				map["brah"].Insert(0, "Segoe UI Historic");
+				map["cari"].Insert(0, "Segoe UI Historic");
+				map["cprt"].Insert(0, "Segoe UI Historic");
+				map["egyp"].Insert(0, "Segoe UI Historic");
+				map["armi"].Insert(0, "Segoe UI Historic");
+				map["phli"].Insert(0, "Segoe UI Historic");
+				map["prti"].Insert(0, "Segoe UI Historic");
+				map["khar"].Insert(0, "Segoe UI Historic");
+				map["lyci"].Insert(0, "Segoe UI Historic");
+				map["lydi"].Insert(0, "Segoe UI Historic");
+				map["phnx"].Insert(0, "Segoe UI Historic");
+				map["xpeo"].Insert(0, "Segoe UI Historic");
+				map["sarb"].Insert(0, "Segoe UI Historic");
+				map["shaw"].Insert(0, "Segoe UI Historic");
+				map["xsux"].Insert(0, "Segoe UI Historic");
+				map["ugar"].Insert(0, "Segoe UI Historic");
 				// Segoe UI Symbol -> Segoe UI Historic
-				MapScriptToTypefaces["glag"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["goth"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["merc"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["ogam"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["ital"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["orkh"].Insert(0, "Segoe UI Historic");
-				MapScriptToTypefaces["runr"].Insert(0, "Segoe UI Historic");
+				map["glag"].Insert(0, "Segoe UI Historic");
+				map["goth"].Insert(0, "Segoe UI Historic");
+				map["merc"].Insert(0, "Segoe UI Historic");
+				map["ogam"].Insert(0, "Segoe UI Historic");
+				map["ital"].Insert(0, "Segoe UI Historic");
+				map["orkh"].Insert(0, "Segoe UI Historic");
+				map["runr"].Insert(0, "Segoe UI Historic");
 				//
-				MapScriptToTypefaces["jpan"].Insert(0, "Yu Gothic UI");
-				MapScriptToTypefaces["zsym"].Add("Segoe MDL2 Assets");
+				map["jpan"].Insert(0, "Yu Gothic UI");
+				map["zsym"].Add("Segoe MDL2 Assets");
+			}
+			return map;
+		}
+		public static Dictionary<string, List<string>> GetDefaultAndroidFallbackMap() {
+			var map = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+			FillKeysWithScripts(map, () => new List<string>());
+			map[UltimateFallbackScript].Insert(0, "Noto Sans CJK TC"); // TODO Modify default fallback
+			map[UltimateFallbackScript].Insert(0, "Noto Sans CJK JP");
+			map[UltimateFallbackScript].Insert(0, "Noto Sans CJK SC");
+			map[UltimateFallbackScript].Insert(0, "Roboto");
+			map["zsye"].Insert(0, "Noto Color Emoji");
+			map["zsye"].Add("Noto Color Emoji Flags");
+			map["arab"].Insert(0, "Noto Naskh Arabic");
+			map["adlm"].Insert(0, "Noto Sans Adlam");
+			map["ahom"].Insert(0, "Noto Sans Ahom");
+			map["hluw"].Insert(0, "Noto Sans Anatolian Hieroglyphs");
+			map["armn"].Insert(0, "Noto Sans Armenian");
+			map["avst"].Insert(0, "Noto Sans Avestan");
+			map["bali"].Insert(0, "Noto Sans Balinese");
+			map["bamu"].Insert(0, "Noto Sans Bamum");
+			map["bass"].Insert(0, "Noto Sans Bassa Vah");
+			map["batk"].Insert(0, "Noto Sans Batak");
+			map["beng"].Insert(0, "Noto Sans Bengali");
+			map["bhks"].Insert(0, "Noto Sans Bhaiksuki");
+			map["brah"].Insert(0, "Noto Sans Brahmi");
+			map["bugi"].Insert(0, "Noto Sans Buginese");
+			map["buhd"].Insert(0, "Noto Sans Buhid");
+			map["jpan"].Insert(0, "Noto Sans CJK JP");
+			map["kore"].Insert(0, "Noto Sans CJK KR");
+			map["hans"].Insert(0, "Noto Sans CJK SC");
+			map["hant"].Insert(0, "Noto Sans CJK TC");
+			map["hant"].Add("Noto Sans CJK HK");
+			map["cans"].Insert(0, "Noto Sans Canadian Aboriginal");
+			map["cari"].Insert(0, "Noto Sans Carian");
+			map["cakm"].Insert(0, "Noto Sans Chakma");
+			map["cham"].Insert(0, "Noto Sans Cham");
+			map["cher"].Insert(0, "Noto Sans Cherokee");
+			map["copt"].Insert(0, "Noto Sans Coptic");
+			map["xsux"].Insert(0, "Noto Sans Cuneiform");
+			map["cprt"].Insert(0, "Noto Sans Cypriot");
+			map["dsrt"].Insert(0, "Noto Sans Deseret");
+			map["deva"].Insert(0, "Noto Sans Devanagari");
+			map["egyp"].Insert(0, "Noto Sans Egyptian Hieroglyphs");
+			map["elba"].Insert(0, "Noto Sans Elbasan");
+			map["ethi"].Insert(0, "Noto Sans Ethiopic");
+			map["geor"].Insert(0, "Noto Sans Georgian");
+			map["glag"].Insert(0, "Noto Sans Glagolitic");
+			map["goth"].Insert(0, "Noto Sans Gothic");
+			map["gran"].Insert(0, "Noto Sans Grantha");
+			map["gujr"].Insert(0, "Noto Sans Gujarati");
+			map["gong"].Insert(0, "Noto Sans Gunjala Gondi");
+			map["guru"].Insert(0, "Noto Sans Gurmukhi");
+			map["rohg"].Insert(0, "Noto Sans Hanifi Rohingya");
+			map["hano"].Insert(0, "Noto Sans Hanunoo");
+			map["hatr"].Insert(0, "Noto Sans Hatran");
+			map["hebr"].Insert(0, "Noto Sans Hebrew");
+			map["armi"].Insert(0, "Noto Sans Imperial Aramaic");
+			map["phli"].Insert(0, "Noto Sans Inscriptional Pahlavi");
+			map["prti"].Insert(0, "Noto Sans Inscriptional Parthian");
+			map["java"].Insert(0, "Noto Sans Javanese");
+			map["kthi"].Insert(0, "Noto Sans Kaithi");
+			map["knda"].Insert(0, "Noto Sans Kannada");
+			map["kali"].Insert(0, "Noto Sans KayahLi");
+			map["khar"].Insert(0, "Noto Sans Kharoshthi");
+			map["khmr"].Insert(0, "Noto Sans Khmer");
+			map["khoj"].Insert(0, "Noto Sans Khojki");
+			map["laoo"].Insert(0, "Noto Sans Lao");
+			map["lepc"].Insert(0, "Noto Sans Lepcha");
+			map["limb"].Insert(0, "Noto Sans Limbu");
+			map["lina"].Insert(0, "Noto Sans Linear A");
+			map["linb"].Insert(0, "Noto Sans Linear B");
+			map["lisu"].Insert(0, "Noto Sans Lisu");
+			map["lyci"].Insert(0, "Noto Sans Lycian");
+			map["lydi"].Insert(0, "Noto Sans Lydian");
+			map["mlym"].Insert(0, "Noto Sans Malayalam");
+			map["mand"].Insert(0, "Noto Sans Mandiac");
+			map["mani"].Insert(0, "Noto Sans Manichaean");
+			map["marc"].Insert(0, "Noto Sans Marchen");
+			map["gonm"].Insert(0, "Noto Sans Masaram Gondi");
+			map["medf"].Insert(0, "Noto Sans Medefaidrin");
+			map["mtei"].Insert(0, "Noto Sans Meetei Mayek");
+			map["merc"].Insert(0, "Noto Sans Meroitic");
+			map["mero"].Insert(0, "Noto Sans Meroitic");
+			map["plrd"].Insert(0, "Noto Sans Miao");
+			map["modi"].Insert(0, "Noto Sans Modi");
+			map["mong"].Insert(0, "Noto Sans Mongolian");
+			map["mroo"].Insert(0, "Noto Sans Mro");
+			map["mult"].Insert(0, "Noto Sans Multani");
+			map["mymr"].Insert(0, "Noto Sans Myanmar");
+			map["nkoo"].Insert(0, "Noto Sans Nko");
+			map["nbat"].Insert(0, "Noto Sans Nabataean");
+			map["talu"].Insert(0, "Noto Sans New Tai Lue");
+			map["newa"].Insert(0, "Noto Sans Newa");
+			map["ogam"].Insert(0, "Noto Sans Ogham");
+			map["olck"].Insert(0, "Noto Sans Ol Chiki");
+			map["ital"].Insert(0, "Noto Sans Old Italian");
+			map["narb"].Insert(0, "Noto Sans Old North Arabian");
+			map["perm"].Insert(0, "Noto Sans Old Permic");
+			map["xpeo"].Insert(0, "Noto Sans Old Persian");
+			map["sarb"].Insert(0, "Noto Sans Old South Arabian");
+			map["orkh"].Insert(0, "Noto Sans Old Turkic");
+			map["orya"].Insert(0, "Noto Sans Oriya");
+			map["osge"].Insert(0, "Noto Sans Osage");
+			map["osma"].Insert(0, "Noto Sans Osmanya");
+			map["hmng"].Insert(0, "Noto Sans Pahawh Hmong");
+			map["palm"].Insert(0, "Noto Sans Palmyrene");
+			map["pauc"].Insert(0, "Noto Sans Pau Cin Hau");
+			map["phag"].Insert(0, "Noto Sans Phags Pa");
+			map["phnx"].Insert(0, "Noto Sans Phoenician");
+			map["rjng"].Insert(0, "Noto Sans Rejang");
+			map["runr"].Insert(0, "Noto Sans Runic");
+			map["samr"].Insert(0, "Noto Sans Samaritan");
+			map["saur"].Insert(0, "Noto Sans Saurashtra");
+			map["shrd"].Insert(0, "Noto Sans Sharada");
+			map["shaw"].Insert(0, "Noto Sans Shavian");
+			map["sinh"].Insert(0, "Noto Sans Sinhala");
+			map["sora"].Insert(0, "Noto Sans Sora Sompeng");
+			map["soyo"].Insert(0, "Noto Sans Soyombo");
+			map["sund"].Insert(0, "Noto Sans Sundanese");
+			map["sylo"].Insert(0, "Noto Sans Syloti Nagri");
+			map["zsym"].Insert(0, "Noto Sans Symbols");
+			map["syrc"].Add("Noto Sans Syriac Eastern");
+			map["syrc"].Add("Noto Sans Syriac Western");
+			map["syrc"].Add("Noto Sans Syriac Estrangela");
+			map["tglg"].Insert(0, "Noto Sans Tagalog");
+			map["tagb"].Insert(0, "Noto Sans Tagbanwa");
+			map["tale"].Insert(0, "Noto Sans Tai Le");
+			map["lana"].Insert(0, "Noto Sans Tai Tham");
+			map["tavt"].Insert(0, "Noto Sans Tai Viet");
+			map["takr"].Insert(0, "Noto Sans Takri");
+			map["taml"].Insert(0, "Noto Sans Tamil");
+			map["telu"].Insert(0, "Noto Sans Telugu");
+			map["thaa"].Insert(0, "Noto Sans Thaana");
+			map["thai"].Insert(0, "Noto Sans Thai");
+			map["tfng"].Insert(0, "Noto Sans Tifinagh");
+			map["ugar"].Insert(0, "Noto Sans Ugaritic");
+			map["vaii"].Insert(0, "Noto Sans Vai");
+			map["wcho"].Insert(0, "Noto Sans Wancho");
+			map["wara"].Insert(0, "Noto Sans Warang Citi");
+			map["yiii"].Insert(0, "Noto Sans Yi");
+			return map;
+		}
+		static void FillKeysWithScripts<T>(IDictionary<string, T> map, Func<T> value) {
+			foreach (var s in IdValidity.Enumerate("script")) map.Add(s, value());
+		}
+
+		public FallbackListFontMatcher(LanguageMatching matcher, FontManager manager) : base(manager) {
+			_matcher = matcher;
+		}
+		public override IEnumerable<Typeface> MatchLanguage(LanguageId lang, bool distinctFamily = false) {
+			var supported = MapScriptToTypefaces.Keys.Select(i => new LanguageId(i)).ToList();
+			bool flag = false;
+			while (_matcher.Match(lang, supported, out var match, out var distance)) {
+				if (distance > 40) break;
+				Shared.Logger.Log(0, "UI", "Matching fonts for language {0}, distance = {1}", match, distance);
+				if (match.Script.Equals(UltimateFallbackScript, StringComparison.OrdinalIgnoreCase)) {
+					flag = true;
+				}
+				var candidates = MapScriptToTypefaces[match.Script];
+				foreach (var typeface in EnumerateTypefaces(candidates, distinctFamily)) {
+					yield return typeface;
+				}
+				supported.Remove(match);
+			}
+			if (flag) yield break;
+			Shared.Logger.Log(0, "UI", "Matching fallback fonts");
+			foreach (var typeface in EnumerateTypefaces(MapScriptToTypefaces[UltimateFallbackScript], distinctFamily)) {
+				yield return typeface;
 			}
 		}
-		public void LoadDefaultAndroidFallbackList() {
-			if (Environment.OSVersion.Platform != PlatformID.Unix) return;
-			MapScriptToTypefaces.Clear();
-			ScriptUtils.FillKeysWithScripts(MapScriptToTypefaces, () => new List<string>());
-			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK TC"); // TODO Modify default fallback
-			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK JP");
-			MapScriptToTypefaces["zyyy"].Insert(0, "Noto Sans CJK SC");
-			MapScriptToTypefaces["zyyy"].Insert(0, "Roboto");
-			MapScriptToTypefaces["zsye"].Insert(0, "Noto Color Emoji");
-			MapScriptToTypefaces["zsye"].Add("Noto Color Emoji Flags");
-			MapScriptToTypefaces["arab"].Insert(0, "Noto Naskh Arabic");
-			MapScriptToTypefaces["adlm"].Insert(0, "Noto Sans Adlam");
-			MapScriptToTypefaces["ahom"].Insert(0, "Noto Sans Ahom");
-			MapScriptToTypefaces["hluw"].Insert(0, "Noto Sans Anatolian Hieroglyphs");
-			MapScriptToTypefaces["armn"].Insert(0, "Noto Sans Armenian");
-			MapScriptToTypefaces["avst"].Insert(0, "Noto Sans Avestan");
-			MapScriptToTypefaces["bali"].Insert(0, "Noto Sans Balinese");
-			MapScriptToTypefaces["bamu"].Insert(0, "Noto Sans Bamum");
-			MapScriptToTypefaces["bass"].Insert(0, "Noto Sans Bassa Vah");
-			MapScriptToTypefaces["batk"].Insert(0, "Noto Sans Batak");
-			MapScriptToTypefaces["beng"].Insert(0, "Noto Sans Bengali");
-			MapScriptToTypefaces["bhks"].Insert(0, "Noto Sans Bhaiksuki");
-			MapScriptToTypefaces["brah"].Insert(0, "Noto Sans Brahmi");
-			MapScriptToTypefaces["bugi"].Insert(0, "Noto Sans Buginese");
-			MapScriptToTypefaces["buhd"].Insert(0, "Noto Sans Buhid");
-			MapScriptToTypefaces["jpan"].Insert(0, "Noto Sans CJK JP");
-			MapScriptToTypefaces["kore"].Insert(0, "Noto Sans CJK KR");
-			MapScriptToTypefaces["hans"].Insert(0, "Noto Sans CJK SC");
-			MapScriptToTypefaces["hant"].Insert(0, "Noto Sans CJK TC");
-			MapScriptToTypefaces["hant"].Add("Noto Sans CJK HK");
-			MapScriptToTypefaces["cans"].Insert(0, "Noto Sans Canadian Aboriginal");
-			MapScriptToTypefaces["cari"].Insert(0, "Noto Sans Carian");
-			MapScriptToTypefaces["cakm"].Insert(0, "Noto Sans Chakma");
-			MapScriptToTypefaces["cham"].Insert(0, "Noto Sans Cham");
-			MapScriptToTypefaces["cher"].Insert(0, "Noto Sans Cherokee");
-			MapScriptToTypefaces["copt"].Insert(0, "Noto Sans Coptic");
-			MapScriptToTypefaces["xsux"].Insert(0, "Noto Sans Cuneiform");
-			MapScriptToTypefaces["cprt"].Insert(0, "Noto Sans Cypriot");
-			MapScriptToTypefaces["dsrt"].Insert(0, "Noto Sans Deseret");
-			MapScriptToTypefaces["deva"].Insert(0, "Noto Sans Devanagari");
-			MapScriptToTypefaces["egyp"].Insert(0, "Noto Sans Egyptian Hieroglyphs");
-			MapScriptToTypefaces["elba"].Insert(0, "Noto Sans Elbasan");
-			MapScriptToTypefaces["ethi"].Insert(0, "Noto Sans Ethiopic");
-			MapScriptToTypefaces["geor"].Insert(0, "Noto Sans Georgian");
-			MapScriptToTypefaces["glag"].Insert(0, "Noto Sans Glagolitic");
-			MapScriptToTypefaces["goth"].Insert(0, "Noto Sans Gothic");
-			MapScriptToTypefaces["gran"].Insert(0, "Noto Sans Grantha");
-			MapScriptToTypefaces["gujr"].Insert(0, "Noto Sans Gujarati");
-			MapScriptToTypefaces["gong"].Insert(0, "Noto Sans Gunjala Gondi");
-			MapScriptToTypefaces["guru"].Insert(0, "Noto Sans Gurmukhi");
-			MapScriptToTypefaces["rohg"].Insert(0, "Noto Sans Hanifi Rohingya");
-			MapScriptToTypefaces["hano"].Insert(0, "Noto Sans Hanunoo");
-			MapScriptToTypefaces["hatr"].Insert(0, "Noto Sans Hatran");
-			MapScriptToTypefaces["hebr"].Insert(0, "Noto Sans Hebrew");
-			MapScriptToTypefaces["armi"].Insert(0, "Noto Sans Imperial Aramaic");
-			MapScriptToTypefaces["phli"].Insert(0, "Noto Sans Inscriptional Pahlavi");
-			MapScriptToTypefaces["prti"].Insert(0, "Noto Sans Inscriptional Parthian");
-			MapScriptToTypefaces["java"].Insert(0, "Noto Sans Javanese");
-			MapScriptToTypefaces["kthi"].Insert(0, "Noto Sans Kaithi");
-			MapScriptToTypefaces["knda"].Insert(0, "Noto Sans Kannada");
-			MapScriptToTypefaces["kali"].Insert(0, "Noto Sans KayahLi");
-			MapScriptToTypefaces["khar"].Insert(0, "Noto Sans Kharoshthi");
-			MapScriptToTypefaces["khmr"].Insert(0, "Noto Sans Khmer");
-			MapScriptToTypefaces["khoj"].Insert(0, "Noto Sans Khojki");
-			MapScriptToTypefaces["laoo"].Insert(0, "Noto Sans Lao");
-			MapScriptToTypefaces["lepc"].Insert(0, "Noto Sans Lepcha");
-			MapScriptToTypefaces["limb"].Insert(0, "Noto Sans Limbu");
-			MapScriptToTypefaces["lina"].Insert(0, "Noto Sans Linear A");
-			MapScriptToTypefaces["linb"].Insert(0, "Noto Sans Linear B");
-			MapScriptToTypefaces["lisu"].Insert(0, "Noto Sans Lisu");
-			MapScriptToTypefaces["lyci"].Insert(0, "Noto Sans Lycian");
-			MapScriptToTypefaces["lydi"].Insert(0, "Noto Sans Lydian");
-			MapScriptToTypefaces["mlym"].Insert(0, "Noto Sans Malayalam");
-			MapScriptToTypefaces["mand"].Insert(0, "Noto Sans Mandiac");
-			MapScriptToTypefaces["mani"].Insert(0, "Noto Sans Manichaean");
-			MapScriptToTypefaces["marc"].Insert(0, "Noto Sans Marchen");
-			MapScriptToTypefaces["gonm"].Insert(0, "Noto Sans Masaram Gondi");
-			MapScriptToTypefaces["medf"].Insert(0, "Noto Sans Medefaidrin");
-			MapScriptToTypefaces["mtei"].Insert(0, "Noto Sans Meetei Mayek");
-			MapScriptToTypefaces["merc"].Insert(0, "Noto Sans Meroitic");
-			MapScriptToTypefaces["mero"].Insert(0, "Noto Sans Meroitic");
-			MapScriptToTypefaces["plrd"].Insert(0, "Noto Sans Miao");
-			MapScriptToTypefaces["modi"].Insert(0, "Noto Sans Modi");
-			MapScriptToTypefaces["mong"].Insert(0, "Noto Sans Mongolian");
-			MapScriptToTypefaces["mroo"].Insert(0, "Noto Sans Mro");
-			MapScriptToTypefaces["mult"].Insert(0, "Noto Sans Multani");
-			MapScriptToTypefaces["mymr"].Insert(0, "Noto Sans Myanmar");
-			MapScriptToTypefaces["nkoo"].Insert(0, "Noto Sans Nko");
-			MapScriptToTypefaces["nbat"].Insert(0, "Noto Sans Nabataean");
-			MapScriptToTypefaces["talu"].Insert(0, "Noto Sans New Tai Lue");
-			MapScriptToTypefaces["newa"].Insert(0, "Noto Sans Newa");
-			MapScriptToTypefaces["ogam"].Insert(0, "Noto Sans Ogham");
-			MapScriptToTypefaces["olck"].Insert(0, "Noto Sans Ol Chiki");
-			MapScriptToTypefaces["ital"].Insert(0, "Noto Sans Old Italian");
-			MapScriptToTypefaces["narb"].Insert(0, "Noto Sans Old North Arabian");
-			MapScriptToTypefaces["perm"].Insert(0, "Noto Sans Old Permic");
-			MapScriptToTypefaces["xpeo"].Insert(0, "Noto Sans Old Persian");
-			MapScriptToTypefaces["sarb"].Insert(0, "Noto Sans Old South Arabian");
-			MapScriptToTypefaces["orkh"].Insert(0, "Noto Sans Old Turkic");
-			MapScriptToTypefaces["orya"].Insert(0, "Noto Sans Oriya");
-			MapScriptToTypefaces["osge"].Insert(0, "Noto Sans Osage");
-			MapScriptToTypefaces["osma"].Insert(0, "Noto Sans Osmanya");
-			MapScriptToTypefaces["hmng"].Insert(0, "Noto Sans Pahawh Hmong");
-			MapScriptToTypefaces["palm"].Insert(0, "Noto Sans Palmyrene");
-			MapScriptToTypefaces["pauc"].Insert(0, "Noto Sans Pau Cin Hau");
-			MapScriptToTypefaces["phag"].Insert(0, "Noto Sans Phags Pa");
-			MapScriptToTypefaces["phnx"].Insert(0, "Noto Sans Phoenician");
-			MapScriptToTypefaces["rjng"].Insert(0, "Noto Sans Rejang");
-			MapScriptToTypefaces["runr"].Insert(0, "Noto Sans Runic");
-			MapScriptToTypefaces["samr"].Insert(0, "Noto Sans Samaritan");
-			MapScriptToTypefaces["saur"].Insert(0, "Noto Sans Saurashtra");
-			MapScriptToTypefaces["shrd"].Insert(0, "Noto Sans Sharada");
-			MapScriptToTypefaces["shaw"].Insert(0, "Noto Sans Shavian");
-			MapScriptToTypefaces["sinh"].Insert(0, "Noto Sans Sinhala");
-			MapScriptToTypefaces["sora"].Insert(0, "Noto Sans Sora Sompeng");
-			MapScriptToTypefaces["soyo"].Insert(0, "Noto Sans Soyombo");
-			MapScriptToTypefaces["sund"].Insert(0, "Noto Sans Sundanese");
-			MapScriptToTypefaces["sylo"].Insert(0, "Noto Sans Syloti Nagri");
-			MapScriptToTypefaces["zsym"].Insert(0, "Noto Sans Symbols");
-			MapScriptToTypefaces["syrn"].Insert(0, "Noto Sans Syriac Eastern");
-			MapScriptToTypefaces["syre"].Insert(0, "Noto Sans Syriac Estrangela");
-			MapScriptToTypefaces["syrj"].Insert(0, "Noto Sans Syriac Western");
-			MapScriptToTypefaces["tglg"].Insert(0, "Noto Sans Tagalog");
-			MapScriptToTypefaces["tagb"].Insert(0, "Noto Sans Tagbanwa");
-			MapScriptToTypefaces["tale"].Insert(0, "Noto Sans Tai Le");
-			MapScriptToTypefaces["lana"].Insert(0, "Noto Sans Tai Tham");
-			MapScriptToTypefaces["tavt"].Insert(0, "Noto Sans Tai Viet");
-			MapScriptToTypefaces["takr"].Insert(0, "Noto Sans Takri");
-			MapScriptToTypefaces["taml"].Insert(0, "Noto Sans Tamil");
-			MapScriptToTypefaces["telu"].Insert(0, "Noto Sans Telugu");
-			MapScriptToTypefaces["thaa"].Insert(0, "Noto Sans Thaana");
-			MapScriptToTypefaces["thai"].Insert(0, "Noto Sans Thai");
-			MapScriptToTypefaces["tfng"].Insert(0, "Noto Sans Tifinagh");
-			MapScriptToTypefaces["ugar"].Insert(0, "Noto Sans Ugaritic");
-			MapScriptToTypefaces["vaii"].Insert(0, "Noto Sans Vai");
-			MapScriptToTypefaces["wcho"].Insert(0, "Noto Sans Wancho");
-			MapScriptToTypefaces["wara"].Insert(0, "Noto Sans Warang Citi");
-			MapScriptToTypefaces["yiii"].Insert(0, "Noto Sans Yi");
-		}
-		public FallbackListFontMatcher(FontManager manager) : base(manager) { }
-		public override IEnumerable<Typeface> MatchScript(string script = null, bool distinctFamily = false) {
-			if (string.IsNullOrEmpty(script)) script = ScriptUtils.UltimateFallbackScript;
-			List<string> candidates;
-			IEnumerable<string> candidateScripts = new string[] { script };
-			while (candidateScripts != null) {
-				foreach (var candidateScript in candidateScripts) {
-					if (MapScriptToTypefaces.TryGetValue(candidateScript, out candidates)) {
-						foreach (var candidate in candidates) {
-							IReadOnlyCollection<Typeface> typefaces1;
-							if (Manager.MapFullNameToTypeface.TryGetValue(candidate, out typefaces1)) {
-								foreach (var typeface in typefaces1) {
-									yield return typeface;
-								}
-							}
-							if (distinctFamily) continue;
-							IReadOnlyCollection<Typeface> typefaces2;
-							if (Manager.MapNameToTypefaces.TryGetValue(candidate, out typefaces2)) {
-								foreach (var typeface in typefaces2) {
-									if (typefaces1.Contains(typeface)) continue;
-									yield return typeface;
-								}
-							}
-						}
+		IEnumerable<Typeface> EnumerateTypefaces(List<string> candidates, bool distinctFamily) {
+			foreach (var candidate in candidates) {
+				if (Manager.MapFullNameToTypeface.TryGetValue(candidate, out var typeface1)) {
+					yield return typeface1;
+				}
+				if (distinctFamily) continue;
+				if (Manager.MapNameToTypefaces.TryGetValue(candidate, out IReadOnlyCollection<Typeface> typefaces2)) {
+					foreach (var typeface in typefaces2) {
+						if (typeface1 == typeface) continue;
+						yield return typeface;
 					}
 				}
-				candidateScripts = ScriptUtils.EnumerateFallbackScripts(script);
 			}
 		}
 	}

Assets/Cryville/Common/Font/FontTable.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
+#pragma warning disable IDE0049
 namespace Cryville.Common.Font {
 	public abstract class FontTable<T> {
 		protected UInt32 Offset { get; private set; }
@@ -24,15 +25,18 @@ namespace Cryville.Common.Font {
 		readonly UInt16 majorVersion;
 		readonly UInt16 minorVersion;
 		readonly UInt32 numFonts;
-		readonly List<UInt32> tableDirectoryOffsets = new List<UInt32>();
+		readonly List<UInt32> tableDirectoryOffsets = new();
+#pragma warning disable IDE0052 // Reserved
 		readonly String dsigTag;
 		readonly UInt32 dsigLength;
 		readonly UInt32 dsigOffset;
+#pragma warning restore IDE0052 // Reserved
 		public TTCHeader(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			ttcTag = reader.ReadTag();
-			if (ttcTag != "ttcf") throw new NotImplementedException();
+			if (ttcTag != "ttcf") throw new NotSupportedException();
 			majorVersion = reader.ReadUInt16();
 			minorVersion = reader.ReadUInt16();
+			if (minorVersion != 0) throw new NotSupportedException();
 			numFonts = reader.ReadUInt32();
 			for (UInt32 i = 0; i < numFonts; i++) tableDirectoryOffsets.Add(reader.ReadUInt32());
 			if (majorVersion == 2) {
@@ -52,12 +56,16 @@ namespace Cryville.Common.Font {
 	public sealed class TableDirectory : FontTable<TableRecord, object> {
 		readonly UInt32 sfntVersion;
 		readonly UInt16 numTables;
+#pragma warning disable IDE0052 // Reserved
 		readonly UInt16 searchRange;
 		readonly UInt16 entrySelector;
 		readonly UInt16 rangeShift;
-		readonly List<TableRecord> tableRecords = new List<TableRecord>();
+#pragma warning restore IDE0052 // Reserved
+		readonly List<TableRecord> tableRecords = new();
 		public TableDirectory(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			sfntVersion = reader.ReadUInt32();
+			if (sfntVersion != 0x00010000 && sfntVersion != 0x4F54544F &&
+				sfntVersion != 0x74727565 && sfntVersion != 0x74797031) throw new NotSupportedException();
 			numTables = reader.ReadUInt16();
 			searchRange = reader.ReadUInt16();
 			entrySelector = reader.ReadUInt16();
@@ -73,13 +81,11 @@ namespace Cryville.Common.Font {
 		public override IReadOnlyList<TableRecord> GetItems() {
 			return tableRecords;
 		}
-		public override object GetSubTable(TableRecord item) {
-			switch (item.tableTag) {
-				case "name": return new NameTable(Reader, item.offset);
-				case "meta": return new MetaTable(Reader, item.offset);
-				default: throw new NotImplementedException();
-			}
-		}
+		public override object GetSubTable(TableRecord item) => item.tableTag switch {
+			"name" => new NameTable(Reader, item.offset),
+			"meta" => new MetaTable(Reader, item.offset),
+			_ => throw new NotImplementedException(),
+		};
 	}
 	public struct TableRecord {
 		public string tableTag;
@@ -91,56 +97,71 @@ namespace Cryville.Common.Font {
 		readonly UInt16 version;
 		readonly UInt16 count;
 		readonly UInt16 storageOffset;
-		readonly List<NameRecord> nameRecord = new List<NameRecord>();
+		readonly List<NameRecord> nameRecord = new();
 		readonly UInt16 langTagCount;
-		readonly List<LangTagRecord> langTagRecord = new List<LangTagRecord>();
+		readonly List<LangTagRecord> langTagRecord = new();
 		public NameTable(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			version = reader.ReadUInt16();
 			count = reader.ReadUInt16();
 			storageOffset = reader.ReadUInt16();
 			for (UInt16 i = 0; i < count; i++)
-				nameRecord.Add(new NameRecord {
-					platformID = reader.ReadUInt16(),
-					encodingID = reader.ReadUInt16(),
-					languageID = reader.ReadUInt16(),
-					nameID = (NameID)reader.ReadUInt16(),
-					length = reader.ReadUInt16(),
-					stringOffset = reader.ReadUInt16(),
-				});
+				nameRecord.Add(new NameRecord(
+					reader.ReadUInt16(),
+					reader.ReadUInt16(),
+					reader.ReadUInt16(),
+					(NameID)reader.ReadUInt16(),
+					reader.ReadUInt16(),
+					reader.ReadUInt16()
+				));
 			if (version == 1) {
 				langTagCount = reader.ReadUInt16();
 				for (UInt16 i = 0; i < langTagCount; i++)
-					langTagRecord.Add(new LangTagRecord {
-						length = reader.ReadUInt16(),
-						langTagOffset = reader.ReadUInt16(),
-					});
+					langTagRecord.Add(new LangTagRecord(
+						reader.ReadUInt16(),
+						reader.ReadUInt16()
+					));
+			}
+			foreach (var i in nameRecord)
+				i.Load(reader, offset + storageOffset);
+			if (version == 1) {
+				foreach (var i in langTagRecord)
+					i.Load(reader, offset + storageOffset);
 			}
-			UInt32 origin = (UInt32)reader.BaseStream.Position;
-			for (int i = 0; i < nameRecord.Count; i++) nameRecord[i] = nameRecord[i].Load(reader, origin);
-			for (int i = 0; i < langTagRecord.Count; i++) langTagRecord[i] = langTagRecord[i].Load(reader, origin);
 		}
 		public sealed override IReadOnlyList<NameRecord> GetItems() {
 			return nameRecord;
 		}
 	}
-	public struct NameRecord {
-		public UInt16 platformID;
-		public UInt16 encodingID;
-		public UInt16 languageID;
-		public NameID nameID;
-		public UInt16 length;
-		public UInt16 stringOffset;
-		public String value { get; private set; }
-		public NameRecord Load(BinaryReader reader, UInt32 origin) {
-			reader.BaseStream.Position = origin + stringOffset;
+	public class NameRecord {
+		public UInt16 PlatformID { get; private set; }
+		public UInt16 EncodingID { get; private set; }
+		public UInt16 LanguageID { get; private set; }
+		public NameID NameID { get; private set; }
+		public UInt16 Length { get; private set; }
+		public UInt16 StringOffset { get; private set; }
+		public String Value { get; private set; }
+		public NameRecord(UInt16 platformID, UInt16 encodingID, UInt16 languageID, NameID nameID, UInt16 length, UInt16 stringOffset) {
+			PlatformID = platformID;
+			EncodingID = encodingID;
+			LanguageID = languageID;
+			NameID = nameID;
+			Length = length;
+			StringOffset = stringOffset;
+		}
+		public void Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + StringOffset;
 			Encoding encoding;
-			switch (platformID) {
-				case 0: encoding = Encoding.BigEndianUnicode; break;
-				case 3: encoding = Encoding.BigEndianUnicode; break;
-				default: return this;
+			try {
+				switch (PlatformID) {
+					case 0: encoding = Encoding.BigEndianUnicode; break;
+					case 1: encoding = Encoding.GetEncoding(10000 + EncodingID); break;
+					case 3: encoding = Encoding.BigEndianUnicode; break;
+					default: return;
+				}
 			}
-			value = encoding.GetString(reader.ReadBytes(length));
-			return this;
+			catch (NotSupportedException) { return; }
+			catch (ArgumentException) { return; }
+			Value = encoding.GetString(reader.ReadBytes(Length));
 		}
 	}
 	public enum NameID : UInt16 {
@@ -171,47 +192,58 @@ namespace Cryville.Common.Font {
 		DarkBackgroundPalette          = 24,
 		VariationsPostScriptNamePrefix = 25,
 	}
-	public struct LangTagRecord {
-		public UInt16 length;
-		public UInt16 langTagOffset;
-		public String value { get; private set; }
-		public LangTagRecord Load(BinaryReader reader, UInt32 origin) {
-			reader.BaseStream.Position = origin + langTagOffset;
-			value = Encoding.BigEndianUnicode.GetString(reader.ReadBytes(length));
-			return this;
+	public class LangTagRecord {
+		public UInt16 Length { get; private set; }
+		public UInt16 LangTagOffset { get; private set; }
+		public String Value { get; private set; }
+		public LangTagRecord(UInt16 length, UInt16 langTagOffset) {
+			Length = length;
+			LangTagOffset = langTagOffset;
+		}
+		public void Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + LangTagOffset;
+			Value = Encoding.BigEndianUnicode.GetString(reader.ReadBytes(Length));
 		}
 	}
 	public sealed class MetaTable : FontTable<DataMap> {
 		readonly UInt32 version;
+#pragma warning disable IDE0052 // Reserved
 		readonly UInt32 flags;
+#pragma warning restore IDE0052 // Reserved
 		readonly UInt32 dataMapCount;
-		readonly List<DataMap> dataMaps = new List<DataMap>();
+		readonly List<DataMap> dataMaps = new();
 		public MetaTable(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			version = reader.ReadUInt32();
+			if (version != 1) throw new NotSupportedException();
 			flags = reader.ReadUInt32();
 			reader.ReadUInt32();
 			dataMapCount = reader.ReadUInt32();
 			for (UInt32 i = 0; i < dataMapCount; i++)
-				dataMaps.Add(new DataMap {
-					tag = reader.ReadTag(),
-					dataOffset = reader.ReadUInt32(),
-					dataLength = reader.ReadUInt32(),
-				});
-			for (int i = 0; i < dataMaps.Count; i++) dataMaps[i] = dataMaps[i].Load(reader, offset);
+				dataMaps.Add(new DataMap (
+					reader.ReadTag(),
+					reader.ReadUInt32(),
+					reader.ReadUInt32()
+				));
+			foreach (var i in dataMaps)
+				i.Load(reader, offset);
 		}
 		public sealed override IReadOnlyList<DataMap> GetItems() {
 			return dataMaps;
 		}
 	}
-	public struct DataMap {
-		public String tag;
-		public UInt32 dataOffset;
-		public UInt32 dataLength;
-		public String value { get; private set; }
-		public DataMap Load(BinaryReader reader, UInt32 origin) {
-			reader.BaseStream.Position = origin + dataOffset;
-			value = Encoding.ASCII.GetString(reader.ReadBytes((int)dataLength));
-			return this;
+	public class DataMap {
+		public String Tag { get; private set; }
+		public UInt32 DataOffset { get; private set; }
+		public UInt32 DataLength { get; private set; }
+		public String Value { get; private set; }
+		public DataMap(String tag, UInt32 dataOffset, UInt32 dataLength) {
+			Tag = tag;
+			DataOffset = dataOffset;
+			DataLength = dataLength;
+		}
+		public void Load(BinaryReader reader, UInt32 origin) {
+			reader.BaseStream.Position = origin + DataOffset;
+			Value = Encoding.ASCII.GetString(reader.ReadBytes((int)DataLength));
 		}
 	}
 	public static class BinaryReaderExtensions {

Assets/Cryville/Common/Font/Typeface.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 
 namespace Cryville.Common.Font {
@@ -23,9 +23,9 @@ namespace Cryville.Common.Font {
 		protected override void GetName(BinaryReader reader) {
 			var dir = new TableDirectory(reader, (uint)reader.BaseStream.Position);
 			var nameTable = (NameTable)dir.GetSubTable((from i in dir.GetItems() where i.tableTag == "name" select i).Single());
-			FamilyName = (from i in nameTable.GetItems() where i.nameID == NameID.FontFamilyName && i.value != null select i.value).First();
-			SubfamilyName = (from i in nameTable.GetItems() where i.nameID == NameID.FontSubfamilyName && i.value != null select i.value).First();
-			FullName = (from i in nameTable.GetItems() where i.nameID == NameID.FullFontName && i.value != null select i.value).First();
+			FamilyName = (from i in nameTable.GetItems() where i.NameID == NameID.FontFamilyName && i.Value != null select i.Value).First();
+			SubfamilyName = (from i in nameTable.GetItems() where i.NameID == NameID.FontSubfamilyName && i.Value != null select i.Value).First();
+			FullName = (from i in nameTable.GetItems() where i.NameID == NameID.FullFontName && i.Value != null select i.Value).First();
 		}
 	}
 }

Assets/Cryville/Common/IO/BinaryReaderBE.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 

Assets/Cryville/Common/IOExtensions.cs

@@ -25,7 +25,7 @@ namespace Cryville.Common {
 		/// <param name="encoding">The encoding of the string.</param>
 		/// <returns>The string read from the reader.</returns>
 		public static string ReadUInt16String(this BinaryReader reader, Encoding encoding = null) {
-			if (encoding == null) encoding = Encoding.UTF8;
+			encoding ??= Encoding.UTF8;
 			var len = reader.ReadUInt16();
 			byte[] buffer = reader.ReadBytes(len);
 			return encoding.GetString(buffer);
@@ -38,7 +38,7 @@ namespace Cryville.Common {
 		/// <param name="value">The string to write by the writer.</param>
 		/// <param name="encoding">The encoding of the string.</param>
 		public static void WriteUInt16String(this BinaryWriter writer, string value, Encoding encoding = null) {
-			if (encoding == null) encoding = Encoding.UTF8;
+			encoding ??= Encoding.UTF8;
 			byte[] buffer = encoding.GetBytes(value);
 			writer.Write((ushort)buffer.Length);
 			writer.Write(buffer);

Assets/Cryville/Common/Identifier.cs

@@ -1,27 +1,27 @@
-using System;
+using System;
 
 namespace Cryville.Common {
 	public struct Identifier : IEquatable<Identifier> {
-		public static Identifier Empty = new Identifier(0);
+		public static Identifier Empty = new(0);
 		public int Key { get; private set; }
-		public object Name { get { return IdentifierManager.SharedInstance.Retrieve(Key); } }
+		public readonly object Name => IdentifierManager.Shared.Retrieve(Key);
 		public Identifier(int key) {
 			Key = key;
 		}
 		public Identifier(object name) {
-			Key = IdentifierManager.SharedInstance.Request(name);
+			Key = IdentifierManager.Shared.Request(name);
 		}
-		public override bool Equals(object obj) {
-			if (obj == null || !(obj is Identifier)) return false;
-			return Equals((Identifier)obj);
+		public override readonly bool Equals(object obj) {
+			if (obj == null || obj is not Identifier other) return false;
+			return Equals(other);
 		}
-		public bool Equals(Identifier other) {
+		public readonly bool Equals(Identifier other) {
 			return Key == other.Key;
 		}
-		public override int GetHashCode() {
+		public override readonly int GetHashCode() {
 			return Key;
 		}
-		public override string ToString() {
+		public override readonly string ToString() {
 			if (Key == 0) return "";
 			return Name.ToString();
 		}

Assets/Cryville/Common/IdentifierManager.cs

@@ -1,52 +0,0 @@
-using System.Collections.Generic;
-
-namespace Cryville.Common {
-	/// <summary>
-	/// A manager that assigns each given identifiers a unique integer ID.
-	/// </summary>
-	public class IdentifierManager {
-		/// <summary>
-		/// A shared instance of the <see cref="IdentifierManager" /> class.
-		/// </summary>
-		public static IdentifierManager SharedInstance = new IdentifierManager();
-
-		readonly Dictionary<object, int> _idents = new Dictionary<object, int>();
-		readonly List<object> _ids = new List<object>();
-
-		readonly object _syncRoot = new object();
-
-		/// <summary>
-		/// Creates an instance of the <see cref="IdentifierManager" /> class.
-		/// </summary>
-		public IdentifierManager() {
-			Request(this);
-		}
-
-		/// <summary>
-		/// Requests an integer ID for an identifier.
-		/// </summary>
-		/// <param name="ident">The identifier.</param>
-		/// <returns>The integer ID.</returns>
-		public int Request(object ident) {
-			lock (_syncRoot) {
-				int id;
-				if (!_idents.TryGetValue(ident, out id)) {
-					_idents.Add(ident, id = _idents.Count);
-					_ids.Add(ident);
-				}
-				return id;
-			}
-		}
-
-		/// <summary>
-		/// Retrieves the identifier assigned with an integer ID.
-		/// </summary>
-		/// <param name="id">The integer ID.</param>
-		/// <returns>The identifier.</returns>
-		public object Retrieve(int id) {
-			lock (_syncRoot) {
-				return _ids[id];
-			}
-		}
-	}
-}

Assets/Cryville/Common/IdentifierManager.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 478086496f56eaf46be4df4e2ad37fee
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Logger.cs

@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-
-namespace Cryville.Common {
-	/// <summary>
-	/// A logger.
-	/// </summary>
-	public abstract class Logger {
-		static readonly Dictionary<string, Logger> Instances = new Dictionary<string, Logger>();
-		static readonly Dictionary<string, StreamWriter> Files = new Dictionary<string, StreamWriter>();
-		static string logPath = null;
-		/// <summary>
-		/// Sets the path where the log files shall be stored.
-		/// </summary>
-		/// <param name="path">The path.</param>
-		public static void SetLogPath(string path) {
-			logPath = path;
-			var dir = new DirectoryInfo(path);
-			if (!dir.Exists) dir.Create();
-		}
-		/// <summary>
-		/// Logs to the specified logger.
-		/// </summary>
-		/// <param name="key">The key of the logger.</param>
-		/// <param name="level">The severity level.</param>
-		/// <param name="module">The module that is logging.</param>
-		/// <param name="format">The format string.</param>
-		/// <param name="args">The arguments for formatting.</param>
-		public static void Log(string key, int level, string module, string format, params object[] args) {
-			if (!Instances.ContainsKey(key)) return;
-			Instances[key].Log(level, module, string.Format(format, args));
-			if (Files.ContainsKey(key)) Files[key].WriteLine("[{0:O}] [{1}] <{2}> {3}", DateTime.UtcNow, level, module, string.Format(format, args));
-		}
-		/// <summary>
-		/// Adds a created logger to the shared logger manager.
-		/// </summary>
-		/// <param name="key">The key of the logger.</param>
-		/// <param name="logger">The logger.</param>
-		public static void Create(string key, Logger logger) {
-			Instances[key] = logger;
-			if (logPath != null) {
-				Files[key] = new StreamWriter(logPath + "/" + ((int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds).ToString(CultureInfo.InvariantCulture) + "-" + key + ".log") {
-					AutoFlush = true
-				};
-			}
-		}
-		/// <summary>
-		/// Closes all loggers and related file streams.
-		/// </summary>
-		public static void Close() {
-			Instances.Clear();
-			foreach (var f in Files) f.Value.Dispose();
-			Files.Clear();
-		}
-		/// <summary>
-		/// Logs to the logger.
-		/// </summary>
-		/// <param name="level">The severity level.</param>
-		/// <param name="module">The module that is logging.</param>
-		/// <param name="msg">The message.</param>
-		public virtual void Log(int level, string module, string msg) { }
-	}
-
-	/// <summary>
-	/// A <see cref="Logger" /> that calls a callback function on log.
-	/// </summary>
-	public class InstantLogger : Logger {
-		readonly Action<int, string, string> callback;
-		/// <summary>
-		/// Creates an instance of the <see cref="InstantLogger" /> class.
-		/// </summary>
-		/// <param name="callback">The callback function.</param>
-		/// <exception cref="ArgumentNullException"><paramref name="callback" /> is <see langword="null" />.</exception>
-		public InstantLogger(Action<int, string, string> callback) {
-			if (callback == null)
-				throw new ArgumentNullException("callback");
-			this.callback = callback;
-		}
-		/// <inheritdoc />
-		public override void Log(int level, string module, string msg) {
-			base.Log(level, module, msg);
-			callback(level, module, msg);
-		}
-	}
-
-	/// <summary>
-	/// A <see cref="Logger" /> that buffers the logs for enumeration.
-	/// </summary>
-	public class BufferedLogger : Logger {
-		readonly List<LogEntry> buffer = new List<LogEntry>();
-		/// <summary>
-		/// Creates an instance of the <see cref="BufferedLogger" /> class.
-		/// </summary>
-		public BufferedLogger() { }
-		/// <inheritdoc />
-		public override void Log(int level, string module, string msg) {
-			base.Log(level, module, msg);
-			lock (buffer) {
-				buffer.Add(new LogEntry(level, module, msg));
-			}
-		}
-		/// <summary>
-		/// Enumerates the buffered logs.
-		/// </summary>
-		/// <param name="callback">The callback function to receive the logs.</param>
-		public void Enumerate(Action<int, string, string> callback) {
-			lock (buffer) {
-				foreach (var i in buffer) {
-					callback(i.level, i.module, i.msg);
-				}
-			}
-			buffer.Clear();
-		}
-	}
-
-	struct LogEntry {
-		public int level;
-		public string module;
-		public string msg;
-		public LogEntry(int level, string module, string msg) {
-			this.level = level;
-			this.module = module;
-			this.msg = msg;
-		}
-	}
-}

Assets/Cryville/Common/Logger.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 1c1729cfde78f1c479c9f7eb166e0107
-timeCreated: 1611126212
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Math/ColumnVector.cs

@@ -42,13 +42,13 @@ namespace Cryville.Common.Math {
 			}
 		}
 		/// <summary>
-		/// Performs dot operation with a <see cref="System.Single" /> column vector.
+		/// Performs dot operation with a <see cref="float" /> column vector.
 		/// </summary>
 		/// <param name="lhs">The lefthand column vector.</param>
 		/// <param name="o">The vector operator.</param>
 		/// <returns>The result of the dot operation.</returns>
 		public T Dot(ColumnVector<float> lhs, IVectorOperator<T> o) {
-			T res = default(T);
+			T res = default;
 			for (var i = 0; i < Size; i++)
 				res = o.Add(res, o.ScalarMultiply(lhs[i], content[i]));
 			return res;

Assets/Cryville/Common/Math/CubicBezier.cs

@@ -1,44 +1,27 @@
-using SMath = System.Math;
+using SMath = System.Math;
 
 namespace Cryville.Common.Math {
 	// Ported from https://github.com/arian/cubic-bezier/blob/master/index.js
 	public static class CubicBezier {
 		public static float Evaluate(float t, float x1, float y1, float x2, float y2, float epsilon) {
-			float x = t, t0, t1, t2, tx, d2, i;
-			for (t2 = x, i = 0; i < 8; i++) {
-				tx = CurveX(t2, x1, x2) - x;
-				if (SMath.Abs(tx) < epsilon) return CurveY(t2, y1, y2);
-				d2 = DerivativeCurveX(t2, x1, x2);
-				if (SMath.Abs(d2) < 1e-6) break;
-				t2 -= tx / d2;
-			}
+			float x = t, t0 = 0, t1 = 1, t2 = x;
 
-			t0 = 0; t1 = 1; t2 = x;
-
-			if (t2 < t0) return CurveY(t0, y1, y2);
-			if (t2 > t1) return CurveY(t1, y1, y2);
+			if (t2 < t0) return Curve(t0, y1, y2);
+			if (t2 > t1) return Curve(t1, y1, y2);
 
 			while (t0 < t1) {
-				tx = CurveX(t2, x1, x2);
-				if (SMath.Abs(tx - x) < epsilon) return CurveY(t2, y1, y2);
+				float tx = Curve(t2, x1, x2);
+				if (SMath.Abs(tx - x) < epsilon) return Curve(t2, y1, y2);
 				if (x > tx) t0 = t2;
 				else t1 = t2;
 				t2 = (t1 - t0) * .5f + t0;
 			}
 
-			return CurveY(t2, y1, y2);
+			return Curve(t2, y1, y2);
 		}
-		static float CurveX(float t, float x1, float x2) {
+		static float Curve(float t, float p1, float p2) {
 			float v = 1 - t;
-			return 3 * v * v * t * x1 + 3 * v * t * t * x2 + t * t * t;
-		}
-		static float CurveY(float t, float y1, float y2) {
-			float v = 1 - t;
-			return 3 * v * v * t * y1 + 3 * v * t * t * y2 + t * t * t;
-		}
-		static float DerivativeCurveX(float t, float x1, float x2) {
-			float v = 1 - t;
-			return 3 * (2 * (t - 1) * t + v * v) * x1 + 3 * (-t * t * t + 2 * v * t) * x2;
+			return 3 * v * v * t * p1 + 3 * v * t * t * p2 + t * t * t;
 		}
 	}
 }

Assets/Cryville/Common/Math/FractionUtils.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.Math {
 	/// <summary>

Assets/Cryville/Common/Math/SquareMatrix.cs

@@ -1,4 +1,4 @@
-using UnsafeIL;
+using UnsafeIL;
 
 namespace Cryville.Common.Math {
 	/// <summary>

Assets/Cryville/Common/Network.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f8303a3eeefeacf4ca0c02b5d32e0cff
-folderAsset: yes
-timeCreated: 1621071543
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Network/HttpClient.cs

@@ -1,156 +0,0 @@
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net.Sockets;
-using System.Text;
-
-namespace Cryville.Common.Network {
-	public class HttpClient {
-		private readonly string _directHost;
-		protected string DirectHost { get { return _directHost; } }
-
-		private readonly int _directPort;
-		protected int DirectPort { get { return _directPort; } }
-
-		readonly Uri _baseUri;
-		readonly int origPort;
-
-		protected string Version = "HTTP/1.1";
-		protected TcpClient TcpClient { get; private set; }
-		protected Stream RawTcpStream {
-			get {
-				return TcpClient.GetStream();
-			}
-		}
-		protected virtual Stream Stream {
-			get {
-				return TcpClient.GetStream();
-			}
-		}
-		protected virtual string WindowsProxyProtocolName {
-			get {
-				return "http";
-			}
-		}
-
-		private readonly bool _proxied = false;
-		
-		public Dictionary<string, string> Headers { get; set; }
-		
-		public HttpClient(Uri baseUri, int port = 80) {
-			_directHost = baseUri.Host;
-			_directPort = port;
-			_baseUri = baseUri;
-			origPort = _baseUri.Port;
-			Headers = new Dictionary<string, string>();
-			_proxied = GetProxy(ref _directHost, ref _directPort);
-			Logger.Log("main", 0, "Network", "Connecting to {0}:{1}", DirectHost, DirectPort);
-			TcpClient = new TcpClient(DirectHost, DirectPort);
-		}
-
-		public virtual void Connect() {
-			if (_proxied) {
-				Request(RawTcpStream, "CONNECT", string.Format(CultureInfo.InvariantCulture, "{0}:{1}", _baseUri.Host, origPort));
-			}
-		}
-
-		public virtual void Close() {
-			TcpClient.Close();
-		}
-		
-		public HttpResponse Request(string method, Uri uri, string body = null, Encoding encoding = null) {
-			string struri = GetUri(uri).PathAndQuery;
-			return Request(Stream, method, struri, body, encoding);
-		}
-		
-		public HttpResponse Request(Stream stream, string method, string uri, string body = null, Encoding encoding = null) {
-			var headers = new Dictionary<string, string>();
-			foreach (var h in Headers)
-				headers.Add(h.Key, h.Value);
-			headers["Host"] = _baseUri.Host;
-			byte[] payload = new byte[0];
-			if (body != null) {
-				if (encoding == null)
-					encoding = Encoding.UTF8;
-				payload = encoding.GetBytes(body);
-				headers.Add("Content-Encoding", encoding.EncodingName);
-				headers.Add("Content-Length", payload.Length.ToString(CultureInfo.InvariantCulture));
-			}
-			string request_line = string.Format(
-				"{0} {1} {2}\r\n", method, uri, Version
-			);
-			string header_fields = string.Concat((
-				from h in headers select h.Key + ":" + h.Value + "\r\n"
-			).ToArray());
-			byte[] buffer0 = Encoding.ASCII.GetBytes(string.Format(
-				"{0}{1}\r\n", request_line, header_fields
-			));
-			byte[] buffer1 = new byte[buffer0.Length + payload.Length];
-			Array.Copy(buffer0, buffer1, buffer0.Length);
-			Array.Copy(payload, 0, buffer1, buffer0.Length, payload.Length);
-			Logger.Log("main", 0, "Network", Encoding.UTF8.GetString(buffer1));
-			stream.Write(buffer1, 0, buffer1.Length);
-			stream.Flush();
-			var response = new HttpResponse(stream);
-			Logger.Log("main", 0, "Network", "{0}", response);
-			return response;
-		}
-
-		protected bool GetProxy(ref string host, ref int port) {
-			// TODO use winhttp.dll
-			if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
-				var reg = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings");
-				var proxyEnable = (int)reg.GetValue("ProxyEnable");
-				if (proxyEnable == 0) return false;
-				var proxyStr = (string)reg.GetValue("ProxyServer");
-				if (!string.IsNullOrEmpty(proxyStr)) {
-					string[] proxies = proxyStr.Split(';');
-					foreach (var p in proxies) {
-						if (!p.Contains('=')) {
-							string[] s = p.Split(':');
-							host = s[0];
-							port = int.Parse(s[1]);
-							return true;
-						}
-						else if (p.StartsWith(WindowsProxyProtocolName + "=")) {
-							string[] s = p.Split('=', ':');
-							host = s[1];
-							port = int.Parse(s[2]);
-							return true;
-						}
-					}
-				}
-			}
-			return false;
-		}
-		
-		protected Uri GetUri(string path) {
-			Uri address;
-			if (_baseUri != null) {
-				if (!Uri.TryCreate(_baseUri, path, out address)) {
-					return new Uri(Path.GetFullPath(path));
-				}
-			}
-			else {
-				if (!Uri.TryCreate(path, UriKind.Absolute, out address)) {
-					return new Uri(Path.GetFullPath(path));
-				}
-			}
-			return GetUri(address);
-		}
-		
-		protected Uri GetUri(Uri address) {
-			if (address == null) {
-				throw new ArgumentNullException("address");
-			}
-			Uri uri = address;
-			if (!address.IsAbsoluteUri && _baseUri != null && !Uri.TryCreate(_baseUri, address, out uri)) {
-				return address;
-			}
-			return uri;
-		}
-	}
-}

Assets/Cryville/Common/Network/HttpClient.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 5ea931bf5488011468f3d1243a038874
-timeCreated: 1622589817
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Network/HttpResponse.cs

@@ -1,61 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace Cryville.Common.Network {
-	public class HttpResponse {
-		static readonly char[] spchar = new char[]{ ' ' };
-		public string HttpVersion { get; private set; }
-		public string StatusCode { get; private set; }
-		public string ReasonPhase { get; private set; }
-		public Dictionary<string, string> Headers { get; private set; }
-		public HttpResponseStream MessageBody { get; private set; }
-		internal HttpResponse(Stream stream) {
-			var reader = new BinaryReader(stream, Encoding.ASCII);
-			var statu_line = ReadLine(reader).Split(spchar, 3);
-			HttpVersion = statu_line[0];
-			StatusCode = statu_line[1];
-			ReasonPhase = statu_line[2];
-			Logger.Log("main", 0, "Network", "Receive Response: {0} {1} {2}", HttpVersion, StatusCode, ReasonPhase);
-			Headers = new Dictionary<string, string>();
-			while (ParseHeader(reader, Headers)) ;
-			if (Headers.ContainsKey("content-length")) {
-				int length = int.Parse(Headers["content-length"]);
-				MessageBody = new HttpResponseBlockStream(reader, length);
-			}
-			else if (Headers.ContainsKey("transfer-encoding") && Headers["transfer-encoding"] == "chunked") {
-				MessageBody = new HttpResponseChunkedStream(reader);
-			}
-		}
-
-		public override string ToString() {
-			return string.Format("<{0} {1} {2}>", HttpVersion, StatusCode, ReasonPhase);
-		}
-
-		internal static bool ParseHeader(BinaryReader reader, Dictionary<string, string> headers) {
-			// TODO Multiline header
-			var header = ReadLine(reader);
-			if (header == "") return false;
-			var s = header.Split(':');
-			string field_name = s[0].Trim().ToLower();
-			string field_value = s[1].Trim();
-			if (headers.ContainsKey(field_name)) headers[field_name] += "," + field_value;
-			else headers.Add(field_name, field_value);
-			Logger.Log("main", 0, "Network", "Receive Header {0}: {1}", field_name, field_value);
-			return true;
-		}
-
-		internal static string ReadLine(BinaryReader reader) {
-			StringBuilder result = new StringBuilder();
-			char c;
-			while (true) {
-				c = reader.ReadChar();
-				if (c == '\r') break;
-				result.Append(c);
-			}
-			// TODO Unseekable
-			reader.ReadByte();
-			return result.ToString();
-		}
-	}
-}

Assets/Cryville/Common/Network/HttpResponse.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 07e8215a93e3eb1418685009f0c58dcd
-timeCreated: 1622596274
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Network/HttpResponseStream.cs

@@ -1,133 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-
-namespace Cryville.Common.Network {
-	public abstract class HttpResponseStream : Stream {
-		public override bool CanRead { get { return true; } }
-
-		public override bool CanSeek { get { return false; } }
-
-		public override bool CanWrite { get { return false; } }
-
-		public override long Length { get { throw new NotSupportedException(); } }
-
-		public override long Position {
-			get { throw new NotSupportedException(); }
-			set { throw new NotSupportedException(); }
-		}
-		
-		public override void Flush() { }
-
-		public abstract byte[] ReadToEnd();
-
-		public override long Seek(long offset, SeekOrigin origin) {
-			throw new NotSupportedException();
-		}
-
-		public override void SetLength(long value) {
-			throw new NotSupportedException();
-		}
-
-		public override void Write(byte[] buffer, int offset, int count) {
-			throw new NotSupportedException();
-		}
-	}
-
-	internal sealed class HttpResponseBlockStream : HttpResponseStream {
-		readonly BinaryReader _reader;
-		readonly int _length;
-		int _pos = 0;
-		internal HttpResponseBlockStream(BinaryReader reader, int length) {
-			_reader = reader;
-			_length = length;
-		}
-		public override int Read(byte[] buffer, int offset, int count) {
-			int recv = 0;
-			int recv_len = System.Math.Min(count, _length - _pos);
-			if (recv_len == 0) return 0;
-			while (recv < recv_len) {
-				recv += _reader.Read(buffer, offset + recv, count - recv);
-				Logger.Log("main", 0, "Network", "Message body received: {0}/{1}/{2}", recv, recv_len, _length);
-			}
-			_pos += recv_len;
-			return recv_len;
-		}
-		public override byte[] ReadToEnd() {
-			byte[] buffer = new byte[_length - _pos];
-			Read(buffer, 0, buffer.Length);
-			return buffer;
-		}
-	}
-
-	internal sealed class HttpResponseChunkedStream : HttpResponseStream {
-		readonly BinaryReader _reader;
-		byte[] _chunk = null;
-		int _pos = 0;
-		internal HttpResponseChunkedStream(BinaryReader reader) {
-			_reader = reader;
-			ReadChunk();
-		}
-		public void ReadChunk() {
-			if (_chunk != null && _chunk.Length == 0) return;
-			string[] chunkHeader = HttpResponse.ReadLine(_reader).Split(';');
-			// int chunkSize = Array.IndexOf(LEN, chunkHeader[0].ToLower()[0]);
-			int chunkSize = int.Parse(chunkHeader[0], NumberStyles.HexNumber);
-			if (chunkSize == -1)
-				throw new IOException("Corrupted chunk received");
-			if (chunkSize == 0) {
-				_chunk = new byte[0];
-				// TODO TE Header, now just discard
-				var headers = new Dictionary<string, string>();
-				while (HttpResponse.ParseHeader(_reader, headers)) ;
-				return;
-			}
-			_chunk = new byte[chunkSize];
-			int recv = 0;
-			while (recv < chunkSize) {
-				recv += _reader.Read(_chunk, recv, chunkSize - recv);
-				Logger.Log("main", 0, "Network", "Message chunk received: {0}/{1}", recv, chunkSize);
-			}
-			_pos = 0;
-			if (HttpResponse.ReadLine(_reader) != "")
-				throw new IOException("Corrupted chunk received");
-		}
-		public override int Read(byte[] buffer, int offset, int count) {
-			if (_chunk.Length == 0) return 0;
-			int recv = 0;
-			while (true) {
-				if (count - recv <= _chunk.Length - _pos) break;
-				Array.Copy(_chunk, _pos, buffer, recv, _chunk.Length - _pos);
-				recv += _chunk.Length - _pos;
-				ReadChunk();
-				if (_chunk.Length == 0) return recv;
-			}
-			Array.Copy(_chunk, _pos, buffer, recv, count - recv);
-			return count;
-		}
-		public override byte[] ReadToEnd() {
-			if (_chunk.Length == 0) return new byte[0];
-			List<byte[]> segs = new List<byte[]>();
-			while (true) {
-				if (_pos != 0) {
-					var buffer = new byte[_chunk.Length - _pos];
-					Array.Copy(_chunk, _pos, buffer, 0, buffer.Length);
-					segs.Add(buffer);
-				}
-				else segs.Add(_chunk);
-				ReadChunk();
-				if (_chunk.Length == 0) {
-					var result = new byte[segs.Sum(i => i.Length)];
-					int p = 0;
-					foreach (var i in segs) {
-						Array.Copy(i, 0, result, p, i.Length);
-						p += i.Length;
-					}
-					return result;
-				}
-			}
-		}
-	}
-}

Assets/Cryville/Common/Network/HttpResponseStream.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: f191de447a708da4f9d230e6545ce0a6
-timeCreated: 1635470462
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Network/HttpsClient.cs

@@ -1,33 +0,0 @@
-using System;
-using System.IO;
-
-namespace Cryville.Common.Network {
-	public class HttpsClient : HttpClient {
-		readonly TlsClient _tlsClient;
-		
-		protected override Stream Stream {
-			get {
-				return _tlsClient.Stream;
-			}
-		}
-		protected override string WindowsProxyProtocolName {
-			get {
-				return "https";
-			}
-		}
-
-		public HttpsClient(Uri baseUri) : base(baseUri, 443) {
-			_tlsClient = new TlsClient(RawTcpStream, baseUri.Host);
-		}
-
-		public override void Connect() {
-			base.Connect();
-			_tlsClient.Connect();
-		}
-
-		public override void Close() {
-			_tlsClient.Close();
-			base.Close();
-		}
-	}
-}

Assets/Cryville/Common/Network/HttpsClient.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 9b35290e0e147a342acc29a20c8fceaf
-timeCreated: 1622503538
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Network/TlsClient.cs

@@ -1,98 +0,0 @@
-using Org.BouncyCastle.Security;
-using Org.BouncyCastle.Tls;
-using Org.BouncyCastle.Tls.Crypto;
-using Org.BouncyCastle.Tls.Crypto.Impl.BC;
-using System.Collections;
-using System.IO;
-using System.Linq;
-using System.Text;
-using BcTlsClient = Org.BouncyCastle.Tls.TlsClient;
-
-namespace Cryville.Common.Network {
-	public class TlsClient {
-		readonly TlsClientProtocol _protocol;
-		readonly BcTlsClient _tlsClient;
-		public Stream Stream { get; private set; }
-		public TlsClient(Stream baseStream, string hostname) {
-			_protocol = new TlsClientProtocol(baseStream);
-			_tlsClient = new InternalTlsClient(hostname, new BcTlsCrypto(new SecureRandom()));
-		}
-
-		public void Connect() {
-			_protocol.Connect(_tlsClient);
-			Stream = _protocol.Stream;
-		}
-
-		public void Close() {
-			_protocol.Close();
-		}
-
-		private class InternalTlsClient : DefaultTlsClient {
-			readonly string _host;
-
-			public InternalTlsClient(string host, TlsCrypto crypto) : base(crypto) {
-				_host = host;
-			}
-
-			protected override ProtocolVersion[] GetSupportedVersions() {
-				return ProtocolVersion.TLSv13.DownTo(ProtocolVersion.TLSv12);
-			}
-
-			protected override IList GetProtocolNames() {
-				IList list = new ArrayList {
-					ProtocolName.Http_1_1
-				};
-				return list;
-			}
-
-			private static readonly int[] supportedCipherSuites = {
-				CipherSuite.TLS_AES_128_GCM_SHA256,
-				CipherSuite.TLS_AES_256_GCM_SHA384,
-				CipherSuite.TLS_CHACHA20_POLY1305_SHA256,
-				CipherSuite.TLS_AES_128_CCM_SHA256,
-				CipherSuite.TLS_AES_128_CCM_8_SHA256,
-			};
-			protected override int[] GetSupportedCipherSuites() {
-				return base.GetSupportedCipherSuites().Union(supportedCipherSuites).ToArray();
-			}
-
-			protected override IList GetSupportedSignatureAlgorithms() {
-				var result = base.GetSupportedSignatureAlgorithms();
-				result.Add(SignatureAndHashAlgorithm.ecdsa_brainpoolP256r1tls13_sha256);
-				result.Add(SignatureAndHashAlgorithm.ecdsa_brainpoolP384r1tls13_sha384);
-				result.Add(SignatureAndHashAlgorithm.ecdsa_brainpoolP512r1tls13_sha512);
-				return result;
-			}
-
-			protected override IList GetSniServerNames() {
-				return new ArrayList { new ServerName(0, Encoding.ASCII.GetBytes(_host)) };
-			}
-
-			public override TlsAuthentication GetAuthentication() {
-				return new NullTlsAuthentication();
-			}
-
-			public override void NotifyAlertReceived(short alertLevel, short alertDescription) {
-				Logger.Log("main", 0, "Network/TLS", "TLS Alert {0} {1}", alertLevel, alertDescription);
-			}
-
-			public override void NotifyServerVersion(ProtocolVersion serverVersion) {
-				base.NotifyServerVersion(serverVersion);
-				Logger.Log("main", 0, "Network/TLS", "NotifyServerVersion {0}", serverVersion);
-			}
-
-			public override void NotifySelectedCipherSuite(int selectedCipherSuite) {
-				base.NotifySelectedCipherSuite(selectedCipherSuite);
-				Logger.Log("main", 0, "Network/TLS", "NotifySelectedCipherSuite {0}", selectedCipherSuite);
-			}
-		}
-
-		private class NullTlsAuthentication : TlsAuthentication {
-			public TlsCredentials GetClientCredentials(CertificateRequest certificateRequest) {
-				return null;
-			}
-
-			public void NotifyServerCertificate(TlsServerCertificate serverCertificate) { }
-		}
-	}
-}

Assets/Cryville/Common/Network/TlsClient.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: c9c242bb90fc1cc479a8df1407f21940
-timeCreated: 1622021660
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cryville/Common/Pdt/PdtAttributes.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 
 namespace Cryville.Common.Pdt {
 	/// <summary>
 	/// Indicates that the attributed member is an element list.
 	/// </summary>
 	/// <remarks>
-	/// <para>An element list is a <see cref="System.Collections.IDictionary" /> or <see cref="Cryville.Common.Collections.Generic.IPairList" /> that represents a collection of PDT elements. There must be at most one element list in a class.</para>
+	/// <para>An element list is a <see cref="System.Collections.IDictionary" /> or <see cref="Cryville.Common.Collections.IPairList" /> that represents a collection of PDT elements. There must be at most one element list in a class.</para>
 	/// </remarks>
 	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
 	public class ElementListAttribute : Attribute { }
@@ -14,7 +14,7 @@ namespace Cryville.Common.Pdt {
 	/// Indicates that the attributed member is a property list.
 	/// </summary>
 	/// <remarks>
-	/// <para>A property list is a <see cref="System.Collections.IDictionary" /> or <see cref="Cryville.Common.Collections.Generic.IPairList" /> that represents a collection of PDT properties. There must be at most one property list in a class.</para>
+	/// <para>A property list is a <see cref="System.Collections.IDictionary" /> or <see cref="Cryville.Common.Collections.IPairList" /> that represents a collection of PDT properties. There must be at most one property list in a class.</para>
 	/// </remarks>
 	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
 	public class PropertyListAttribute : Attribute { }

Assets/Cryville/Common/Pdt/PdtEvaluatorBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
@@ -17,32 +17,30 @@ namespace Cryville.Common.Pdt {
 		readonly StackFrame[] _stack = new StackFrame[256];
 		readonly byte[] _mem = new byte[0x100000];
 		bool _revokepttconst;
-		LinkedListNode<PdtInstruction> _rip;
 		/// <summary>
 		/// Evaluates an expression and passes the result to a target operator.
 		/// </summary>
 		/// <param name="target">The target operator.</param>
 		/// <param name="exp">The expression to evaluate.</param>
-		public void Evaluate(PdtOperator target, PdtExpression exp) {
-			_framecount = 0;
-			_goffset = 0;
-			_revokepttconst = false;
-			for (_rip = exp.Instructions.First; _rip != null; _rip = _rip.Next)
-				_rip.Value.Execute(this);
-			Operate(target, _framecount, true);
-			if (exp.IsPotentialConstant) {
-				exp.IsConstant = exp.IsPotentialConstant = !_revokepttconst;
+		/// <returns>Whether the evaluaton succeeded.</returns>
+		public bool Evaluate(PdtOperator target, PdtExpression exp) {
+			var prevFrameCount = _framecount;
+			try {
+				_revokepttconst = false;
+				for (var ip = exp.Instructions.First; ip != null; ip = ip.Next)
+					ip.Value.Execute(this, ref ip);
+				if (exp.IsPotentialConstant) {
+					exp.IsConstant = exp.IsPotentialConstant = !_revokepttconst;
+				}
+				var ret = Operate(target, _framecount - prevFrameCount, true);
+				return ret;
+			}
+			catch (Exception ex) {
+				throw new EvaluationFailureException(exp, ex);
+			}
+			finally {
+				for (var i = prevFrameCount; i < _framecount; i++) DiscardStack();
 			}
-		}
-		/// <summary>
-		/// Patches an expression with a lefthand variable and a compound operator.
-		/// </summary>
-		/// <param name="target">The name of the lefthand variable.</param>
-		/// <param name="op">The name of the compound operator.</param>
-		/// <param name="exp">The expression.</param>
-		public void PatchCompound(int target, int op, PdtExpression exp) {
-			exp.Instructions.AddFirst(new PdtInstruction.PushVariable(target));
-			exp.Instructions.AddLast(new PdtInstruction.Operate(op, 2));
 		}
 		/// <summary>
 		/// Optimizes an expression by merging its instructions.
@@ -54,12 +52,14 @@ namespace Cryville.Common.Pdt {
 			List<PdtInstruction.Collapse> ct;
 			var cols = new Dictionary<LinkedListNode<PdtInstruction>, List<PdtInstruction.Collapse>>();
 			var il = exp.Instructions;
-			for (_rip = il.First; _rip != null; _rip = _rip == null ? il.First : _rip.Next) {
-				var i = _rip.Value;
-				if (i is PdtInstruction.Operate) {
+			var ip = il.First;
+			while (ip != null) {
+				bool nextFlag = false;
+				var i = ip.Value;
+				if (i is PdtInstruction.Operate iop) {
 					int fc0 = _framecount;
-					int fc1 = ((PdtInstruction.Operate)i).Signature.ParamCount;
-					try { i.Execute(this); } catch (Exception) { }
+					int fc1 = iop.Signature.ParamCount;
+					try { i.Execute(this, ref ip); } catch (Exception) { }
 					if (fc0 - _framecount == fc1) {
 						unsafe {
 							fixed (StackFrame* frame = &_stack[_framecount++]) {
@@ -71,29 +71,37 @@ namespace Cryville.Common.Pdt {
 					}
 					else {
 						var frame = _stack[_framecount - 1];
-						_rip = il.AddAfter(_rip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length));
-						for (var j = 0; j <= fc1; j++) il.Remove(_rip.Previous);
+						if (frame.Type != PdtInternalType.Error) {
+							ReplaceIP(il, ref ip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length), cols);
+							for (var j = 0; j < fc1; j++) il.Remove(ip.Previous);
+						}
 					}
 				}
-				else if (i is PdtInstruction.Collapse) {
-					var t = (PdtInstruction.Collapse)i;
+				else if (i is PdtInstruction.Collapse t) {
 					try {
-						var pins = _rip;
-						i.Execute(this);
-						if (_rip == pins) {
-							_rip = _rip.Next;
-							il.Remove(_rip.Previous);
-							il.Remove(_rip.Previous);
-							_rip = _rip.Previous;
+						var pins = ip;
+						i.Execute(this, ref ip);
+						if (_stack[_framecount - 1].Type == PdtInternalType.Error) {
+							throw new EvaluationFailureException();
+						}
+						if (ip == pins) {
+							ip = ip.Next;
+							il.Remove(ip.Previous);
+							il.Remove(ip.Previous);
+							ip = ip.Previous;
+							if (ip == null) {
+								ip = il.First;
+								nextFlag = true;
+							}
 						}
 						else {
-							_rip = pins.Previous;
-							while (_rip.Next != t.Target) il.Remove(_rip.Next);
-							il.Remove(_rip.Next);
+							ip = pins.Previous;
+							while (ip.Next != t.Target) il.Remove(ip.Next);
+							il.Remove(ip.Next);
 							if (cols.TryGetValue(t.Target, out ct)) {
-								foreach (var u in ct) u.Target = _rip;
+								foreach (var u in ct) u.Target = ip;
 								cols.Remove(t.Target);
-								cols.Add(_rip, ct);
+								cols.Add(ip, ct);
 							}
 						}
 					}
@@ -103,15 +111,14 @@ namespace Cryville.Common.Pdt {
 					}
 				}
 				else if (i is PdtInstruction.PushVariable) {
-					i.Execute(this);
+					i.Execute(this, ref ip);
 					var frame = _stack[_framecount - 1];
 					if (frame.Type != PdtInternalType.Undefined && frame.Type != PdtInternalType.Error) {
-						_rip = il.AddAfter(_rip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length));
-						il.Remove(_rip.Previous);
+						ReplaceIP(il, ref ip, new PdtInstruction.PushConstant(frame.Type, _mem, frame.Offset, frame.Length), cols);
 					}
 				}
-				else i.Execute(this);
-				if (_rip != null && cols.TryGetValue(_rip, out ct)) {
+				else i.Execute(this, ref ip);
+				if (ip != null && cols.TryGetValue(ip, out ct)) {
 					unsafe {
 						fixed (StackFrame* frame = &_stack[_framecount - 1]) {
 							frame->Type = PdtInternalType.Error;
@@ -120,19 +127,23 @@ namespace Cryville.Common.Pdt {
 						}
 					}
 				}
+				if (!nextFlag) ip = ip.Next;
 			}
 			exp.IsConstant = true;
 			exp.IsPotentialConstant = true;
 			for (var ins = il.First; ins != null; ins = ins.Next) {
-				if (!(ins.Value is PdtInstruction.PushConstant)) {
+				if (ins.Value is not PdtInstruction.PushConstant) {
 					exp.IsConstant = false;
-				}
-				else if (!(ins.Value is PdtInstruction.PushVariable)) {
-					exp.IsPotentialConstant = false;
-					return;
+					break;
 				}
 			}
 		}
+		void ReplaceIP(LinkedList<PdtInstruction> il, ref LinkedListNode<PdtInstruction> ip, PdtInstruction ins, Dictionary<LinkedListNode<PdtInstruction>, List<PdtInstruction.Collapse>> cols) {
+			if (cols.TryGetValue(ip, out List<PdtInstruction.Collapse> cins)) cols.Remove(ip);
+			ip = il.AddAfter(ip, ins);
+			il.Remove(ip.Previous);
+			if (cins != null) cols.Add(ip, cins);
+		}
 		/// <summary>
 		/// Revokes the potential constant mark of the current expression.
 		/// </summary>
@@ -150,8 +161,7 @@ namespace Cryville.Common.Pdt {
 		}
 		internal unsafe void PushVariable(int name, bool forced) {
 			fixed (StackFrame* frame = &_stack[_framecount++]) {
-				byte[] value;
-				GetVariable(name, forced, out frame->Type, out value);
+				GetVariable(name, forced, out frame->Type, out byte[] value);
 				frame->Offset = _goffset;
 				frame->Length = value.Length;
 				Array.Copy(value, 0, _mem, _goffset, value.Length);
@@ -184,23 +194,36 @@ namespace Cryville.Common.Pdt {
 		/// <returns>An operator of the specific name.</returns>
 		/// <remarks>The parameter count of the returned operator does not necessarily equal to <paramref name="pc" />.</remarks>
 		protected abstract PdtOperator GetOperator(PdtOperatorSignature sig);
-		unsafe void Operate(PdtOperator op, int pc, bool noset = false) {
+		unsafe bool Operate(PdtOperator op, int pc, bool noset = false) {
 			fixed (byte* pmem = _mem) {
 				op.Begin(this, pc);
 				for (int i = 0; i < pc; i++) {
 					var frame = _stack[--_framecount];
+					if (frame.Type == PdtInternalType.Error) {
+						_framecount -= pc - i - 1;
+						_stack[_framecount++] = new StackFrame { Type = PdtInternalType.Error, Offset = -1, Length = 0 };
+						return false;
+					}
 					op.LoadOperand(new PdtVariableMemory(frame.Type, pmem + frame.Offset, frame.Length));
 					_goffset -= frame.Length;
 				}
 				op.Call(pmem + _goffset, noset);
+				return true;
 			}
 		}
-		internal unsafe void Collapse(int name, LinkedListNode<PdtInstruction> target) {
+		internal unsafe void Collapse(int name, ref LinkedListNode<PdtInstruction> self, LinkedListNode<PdtInstruction> target) {
 			fixed (byte* pmem = _mem) {
 				var frame = _stack[--_framecount];
+				_goffset -= frame.Length;
+				if (frame.Type == PdtInternalType.Error) {
+					_stack[_framecount++] = new StackFrame { Type = PdtInternalType.Error, Offset = -1, Length = 0 };
+					self = target;
+					return;
+				}
 				if (Collapse(name, new PdtVariableMemory(frame.Type, pmem + frame.Offset, frame.Length))) {
 					_framecount++;
-					_rip = target;
+					_goffset += frame.Length;
+					self = target;
 				}
 			}
 		}
@@ -226,7 +249,7 @@ namespace Cryville.Common.Pdt {
 	}
 
 	/// <summary>
-	/// The exception that is thrown when the evalution of a <see cref="PdtExpression" /> fails.
+	/// The exception that is thrown when the evaluation of a <see cref="PdtExpression" /> fails.
 	/// </summary>
 	public class EvaluationFailureException : Exception {
 		/// <inheritdoc />
@@ -237,5 +260,16 @@ namespace Cryville.Common.Pdt {
 		public EvaluationFailureException(string message, Exception innerException) : base(message, innerException) { }
 		/// <inheritdoc />
 		protected EvaluationFailureException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+		/// <summary>
+		/// Creates an instance of the <see cref="EvaluationFailureException" /> class with the failing expression.
+		/// </summary>
+		/// <param name="exp">The failing expression.</param>
+		public EvaluationFailureException(PdtExpression exp) : base("Evaluation failed for the expression: " + exp.ToString()) { }
+		/// <summary>
+		/// Creates an instance of the <see cref="EvaluationFailureException" /> class with the failing expression and the inner exception.
+		/// </summary>
+		/// <param name="exp">The failing expression.</param>
+		/// <param name="innerException">The inner exception.</param>
+		public EvaluationFailureException(PdtExpression exp, Exception innerException) : base("Evaluation failed for the expression: " + exp.ToString(), innerException) { }
 	}
 }

Assets/Cryville/Common/Pdt/PdtExpression.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -7,6 +7,18 @@ namespace Cryville.Common.Pdt {
 	/// PDT expression.
 	/// </summary>
 	public class PdtExpression {
+		/// <summary>
+		/// The empty expression.
+		/// </summary>
+		public static readonly PdtExpression Empty;
+		static PdtExpression() {
+			var ins = new LinkedList<PdtInstruction>();
+			ins.AddLast(new PdtInstruction.PushConstant(
+				PdtInternalType.Number, BitConverter.GetBytes(1f)
+			));
+			Empty = new PdtExpression(ins);
+		}
+
 		internal LinkedList<PdtInstruction> Instructions;
 		/// <summary>
 		/// Whether the value of this expression is constant.
@@ -27,9 +39,19 @@ namespace Cryville.Common.Pdt {
 			}
 			return r;
 		}
+		/// <summary>
+		/// Patches an expression with a lefthand variable and a compound operator.
+		/// </summary>
+		/// <param name="target">The name of the lefthand variable.</param>
+		/// <param name="op">The name of the compound operator.</param>
+		/// <param name="exp">The expression.</param>
+		public static void PatchCompound(int target, int op, PdtExpression exp) {
+			exp.Instructions.AddFirst(new PdtInstruction.PushVariable(target));
+			exp.Instructions.AddLast(new PdtInstruction.Operate(op, 2));
+		}
 	}
 	internal abstract class PdtInstruction {
-		internal abstract void Execute(PdtEvaluatorBase etor);
+		internal abstract void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self);
 		public class PushConstant : PdtInstruction {
 			public int Type { get; private set; }
 			public byte[] Value { get; private set; }
@@ -42,7 +64,7 @@ namespace Cryville.Common.Pdt {
 				Value = new byte[len];
 				Array.Copy(buffer, offset, Value, 0, len);
 			}
-			internal override void Execute(PdtEvaluatorBase etor) {
+			internal override void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self) {
 				etor.PushConstant(Type, Value);
 			}
 			public override string ToString() {
@@ -53,12 +75,12 @@ namespace Cryville.Common.Pdt {
 			public int Name { get; private set; }
 			public bool Forced { get; private set; }
 			public PushVariable(int name, bool forced = false) { Name = name; Forced = forced; }
-			public PushVariable(string name, bool forced = false) : this(IdentifierManager.SharedInstance.Request(name)) { Forced = forced; }
-			internal override void Execute(PdtEvaluatorBase etor) {
+			public PushVariable(string name, bool forced = false) : this(IdentifierManager.Shared.Request(name)) { Forced = forced; }
+			internal override void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self) {
 				etor.PushVariable(Name, Forced);
 			}
 			public override string ToString() {
-				return string.Format(Forced ? "pushv ?{0}" : "pushv {0}", IdentifierManager.SharedInstance.Retrieve(Name));
+				return string.Format(Forced ? "pushv ?{0}" : "pushv {0}", IdentifierManager.Shared.Retrieve(Name));
 			}
 		}
 		public class Operate : PdtInstruction {
@@ -69,7 +91,7 @@ namespace Cryville.Common.Pdt {
 			public Operate(string name, int paramCount) {
 				Signature = new PdtOperatorSignature(name, paramCount);
 			}
-			internal override void Execute(PdtEvaluatorBase etor) {
+			internal override void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self) {
 				etor.Operate(Signature);
 			}
 			public override string ToString() {
@@ -80,19 +102,19 @@ namespace Cryville.Common.Pdt {
 			public int Name { get; private set; }
 			public LinkedListNode<PdtInstruction> Target { get; internal set; }
 			public Collapse(string name, LinkedListNode<PdtInstruction> target) {
-				Name = IdentifierManager.SharedInstance.Request(name);
+				Name = IdentifierManager.Shared.Request(name);
 				Target = target;
 			}
-			internal override void Execute(PdtEvaluatorBase etor) {
-				etor.Collapse(Name, Target);
+			internal override void Execute(PdtEvaluatorBase etor, ref LinkedListNode<PdtInstruction> self) {
+				etor.Collapse(Name, ref self, Target);
 			}
 			public override string ToString() {
-				return string.Format("col {0}{{{1}}}", IdentifierManager.SharedInstance.Retrieve(Name), Target.Value);
+				return string.Format("col {0}{{{1}}}", IdentifierManager.Shared.Retrieve(Name), Target.Value);
 			}
 		}
 	}
 	public partial class PdtInterpreter {
-		static readonly Dictionary<char, int> OP_PRIORITY = new Dictionary<char, int> {
+		static readonly Dictionary<char, int> OP_PRIORITY = new() {
 			{ '@', 7 },
 			{ '*', 6 }, { '/', 6 }, { '%', 6 },
 			{ '+', 5 }, { '-', 5 },
@@ -103,7 +125,7 @@ namespace Cryville.Common.Pdt {
 			{ ',', 0 },
 			{ '$', -1 },
 		};
-		static readonly Dictionary<char, int> OP_TYPE = new Dictionary<char, int> {
+		static readonly Dictionary<char, int> OP_TYPE = new() {
 			{ '@', 0 },
 			{ '*', 0 }, { '/', 0 }, { '%', 0 },
 			{ '+', 0 }, { '-', 0 },
@@ -115,36 +137,27 @@ namespace Cryville.Common.Pdt {
 			{ '$', -1 },
 		};
 
-		static readonly PdtExpression _emptyexp;
-		static PdtInterpreter() {
-			var ins = new LinkedList<PdtInstruction>();
-			ins.AddLast(new PdtInstruction.PushConstant(
-				PdtInternalType.Number, BitConverter.GetBytes(1f)
-			));
-			_emptyexp = new PdtExpression(ins);
-		}
-
 		PdtExpToken GetToken() {
 			ws();
 			var result = new PdtExpToken {
-				Type = ct & 0x0fe0
+				Type = ct & (CharCategory)0x0fe0
 			};
 			switch (result.Type) {
-				case 0x0020: result.Value = GetIdentifier(); break;
-				case 0x0040: result.Value = GetNumber(); break;
-				case 0x0100: result.Value = GetString(); break;
+				case CharCategory.IdentifierBegin: result.Value = GetIdentifier(); break;
+				case CharCategory.Digit          : result.Value = GetNumber(); break;
+				case CharCategory.StringDelimiter: result.Value = GetString(); break;
 				default: result.Value = cc.ToString(); Position++; break;
 			}
 			return result;
 		}
 		private struct PdtExpToken {
-			public int Type { get; set; }
+			public CharCategory Type { get; set; }
 			public string Value { get; set; }
-			public override string ToString() {
+			public override readonly string ToString() {
 				return string.Format("0x{0:x4}: {1}", Type, Value);
 			}
-			public static readonly PdtExpToken EmptyOperator = new PdtExpToken {
-				Type = 0x0080,
+			public static readonly PdtExpToken EmptyOperator = new() {
+				Type = CharCategory.Operator,
 				Value = "$",
 			};
 		}
@@ -179,7 +192,7 @@ namespace Cryville.Common.Pdt {
 				t2 = InterpretExpBlock(ins);
 			panic:
 				switch (t2.Type) {
-					case 0x0080:
+					case CharCategory.Operator:
 						if (OP_TYPE[t1.Value[0]] != -1) {
 							int p1 = OP_PRIORITY[t1.Value[0]];
 							int p2 = OP_PRIORITY[t2.Value[0]];
@@ -195,16 +208,16 @@ namespace Cryville.Common.Pdt {
 								default: pc++; break;
 							}
 						}
-						else if (OP_TYPE[t2.Value[0]] == 1) {
+						if (OP_TYPE[t2.Value[0]] == 1) {
 							colp = new Dictionary<LinkedListNode<PdtInstruction>, string> { { ins.Last, t2.Value } };
 						}
 						t1 = t2;
 						break;
-					case 0x0400:
+					case CharCategory.ClosingBracket:
 						if (enc == -2) throw new FormatException("Expression not enclosed correctly: Too many closing brackets");
 						if (ins.Count == insc0) pc = 0;
 						goto exit;
-					case 0x0800:
+					case CharCategory.EndOfExpression:
 						goto exit;
 				}
 			}
@@ -227,7 +240,7 @@ namespace Cryville.Common.Pdt {
 		/// <returns>The expression token following this expression block.</returns>
 		PdtExpToken InterpretExpBlock(LinkedList<PdtInstruction> ins) {
 			var t = GetToken();
-			if (t.Type == 0x0080) {
+			if (t.Type == CharCategory.Operator) {
 				var r = InterpretExpBlock(ins);
 				ins.AddLast(new PdtInstruction.Operate(t.Value, 1));
 				return r;
@@ -235,28 +248,27 @@ namespace Cryville.Common.Pdt {
 			bool flag = false;
 			PdtExpToken? buf = null;
 			while (true) {
-				if (buf != null && t.Type != 0x0200) {
-					PdtExpression def;
-					if (defs.TryGetValue(buf.Value.Value, out def)) {
+				if (buf != null && t.Type != CharCategory.OpeningBracket) {
+					if (defs.TryGetValue(buf.Value.Value, out PdtExpression def)) {
 						foreach (var i in def.Instructions) ins.AddLast(i);
 					}
 					else {
 						var name = buf.Value.Value;
-						if (name[0] == '?') ins.AddLast(new PdtInstruction.PushVariable(name.Substring(1), true));
+						if (name[0] == '?') ins.AddLast(new PdtInstruction.PushVariable(name[1..], true));
 						else ins.AddLast(new PdtInstruction.PushVariable(name));
 					}
 					buf = null;
 					TryPushAdjMul(ins, ref flag);
 				}
 				switch (t.Type) {
-					case 0x0020:
+					case CharCategory.IdentifierBegin:
 						buf = t;
 						break;
-					case 0x0040:
+					case CharCategory.Digit:
 						float num = float.Parse(t.Value);
 						ins.AddLast(new PdtInstruction.PushConstant(PdtInternalType.Number, BitConverter.GetBytes(num)));
 						break;
-					case 0x0100:
+					case CharCategory.StringDelimiter:
 						int strlen = t.Value.Length;
 						unsafe {
 							var strbuf = new byte[strlen * sizeof(char) + sizeof(int)];
@@ -267,7 +279,7 @@ namespace Cryville.Common.Pdt {
 							ins.AddLast(new PdtInstruction.PushConstant(PdtInternalType.String, strbuf));
 						}
 						break;
-					case 0x0200:
+					case CharCategory.OpeningBracket:
 						int pc;
 						InterpretExp(ins, -1, out pc);
 						if (buf != null) {

Assets/Cryville/Common/Pdt/PdtFragmentInterpreter.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Reflection;
+
+namespace Cryville.Common.Pdt {
+	/// <summary>
+	/// Interpreter for fragments in Property Definition Tree (PDT) file format.
+	/// </summary>
+	public class PdtFragmentInterpreter : PdtInterpreter {
+		public PdtFragmentInterpreter() : base(null, new EmptyBinder()) { }
+
+		/// <summary>
+		/// Sets the new source string for the fragment interpreter and resets the position.
+		/// </summary>
+		/// <param name="value">The new source string.</param>
+		public void SetSource(string value) {
+			Source = value;
+			Position = 0;
+		}
+
+		/// <summary>
+		/// The binder.
+		/// </summary>
+		public Binder Binder {
+			get { return _binder; }
+			set { _binder = value; }
+		}
+
+		/// <summary>
+		/// Reads the current character and increments the position.
+		/// </summary>
+		/// <returns>The current character.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new char GetChar() { return base.GetChar(); }
+		/// <summary>
+		/// Reads an identifier.
+		/// </summary>
+		/// <returns>An identifier.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new string GetIdentifier() { return base.GetIdentifier(); }
+		/// <summary>
+		/// Reads a number.
+		/// </summary>
+		/// <returns>A number.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new string GetNumber() { return base.GetNumber(); }
+		/// <summary>
+		/// Reads a string.
+		/// </summary>
+		/// <returns>A string.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new string GetString() { return base.GetString(); }
+		/// <summary>
+		/// Reads an expression.
+		/// </summary>
+		/// <returns>An expression.</returns>
+		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
+		public new PdtExpression GetExp() { return base.GetExp(); }
+	}
+}

Assets/Cryville/Common/Pdt/PdtFragmentInterpreter.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec18f22479042d747b88c093aa90c5c0
+guid: f7088ba23ed4b424eadaf664be48e376
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/Pdt/PdtInternalType.cs

@@ -1,4 +1,4 @@
-namespace Cryville.Common.Pdt {
+namespace Cryville.Common.Pdt {
 	/// <summary>
 	/// The identifiers of the internal types of PDT.
 	/// </summary>

Assets/Cryville/Common/Pdt/PdtInterpreter.cs

@@ -1,33 +1,30 @@
-using Cryville.Common.Collections;
+using Cryville.Common.Collections;
+using Cryville.Common.Reflection;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text.RegularExpressions;
+using System.Text;
+using CMath = System.Math;
 
 namespace Cryville.Common.Pdt {
 	/// <summary>
 	/// Interpreter for Property Definition Tree (PDT) file format.
 	/// </summary>
 	public partial class PdtInterpreter {
-		/// <summary>
-		/// The character category map.
-		/// </summary>
-		/// <remarks>
-		/// <list type="bullet">
-		///		<item><term><c>0x0001</c></term><description>White Space</description></item>
-		///		<item><term><c>0x0010</c></term><description>Identifier</description></item>
-		///		<item><term><c>0x0020</c></term><description>Identifier Begin</description></item>
-		///		<item><term><c>0x0040</c></term><description>Digit</description></item>
-		///		<item><term><c>0x0080</c></term><description>Operator</description></item>
-		///		<item><term><c>0x0100</c></term><description>String</description></item>
-		///		<item><term><c>0x0200</c></term><description>Opening Bracket</description></item>
-		///		<item><term><c>0x0400</c></term><description>Closing Bracket</description></item>
-		///		<item><term><c>0x0800</c></term><description>End of Expression</description></item>
-		///		<item><term><c>0x1000</c></term><description>End of Key</description></item>
-		/// </list>
-		/// </remarks>
+		[Flags]
+		protected enum CharCategory {
+			WhiteSpace      = 0x0001,
+			Identifier      = 0x0010,
+			IdentifierBegin = 0x0020,
+			Digit           = 0x0040,
+			Operator        = 0x0080,
+			StringDelimiter = 0x0100,
+			OpeningBracket  = 0x0200,
+			ClosingBracket  = 0x0400,
+			EndOfExpression = 0x0800,
+			EndOfKey        = 0x1000,
+		}
 		static readonly int[] cm = new int[] {
 			//   0       1       2       3       4       5       6       7       8       9       A       B       C       D       E       F
 			0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000,
@@ -61,12 +58,14 @@ namespace Cryville.Common.Pdt {
 		/// <summary>
 		/// The source string.
 		/// </summary>
-		public string Source { get; private set; }
-		Binder _binder;
+		public string Source { get; protected set; }
+		protected Binder _binder;
 		/// <summary>
 		/// The current position in the string being parsed by the interpreter.
 		/// </summary>
-		public int Position { get; private set; }
+		public int Position { get; protected set; }
+
+		readonly StringBuilder _sb = new();
 #pragma warning disable IDE1006
 		/// <summary>
 		/// The character at the current position.
@@ -77,17 +76,17 @@ namespace Cryville.Common.Pdt {
 		/// The category of the character.
 		/// </summary>
 		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
-		protected int ct { get { return cm[cc]; } }
+		protected CharCategory ct { get { return (CharCategory)cm[cc]; } }
 		/// <summary>
 		/// Reads a token until a character of type <paramref name="flag" /> is met.
 		/// </summary>
 		/// <param name="flag">The type filter.</param>
 		/// <returns>A token from the current position (inclusive) to the next character of type <paramref name="flag" /> (exclusive).</returns>
 		/// <exception cref="IndexOutOfRangeException">No character of type <paramref name="flag" /> is met.</exception>
-		protected string tokenb(int flag) {
+		protected string tokenb(CharCategory flag) {
 			int sp = Position;
 			while ((ct & flag) == 0) Position++;
-			return Source.Substring(sp, Position - sp);
+			return Source[sp..Position];
 		}
 		/// <summary>
 		/// Reads a token until a character that is not of type <paramref name="flag" /> is met.
@@ -95,17 +94,17 @@ namespace Cryville.Common.Pdt {
 		/// <param name="flag">The type filter.</param>
 		/// <returns>A token from the current position (inclusive) to the next character that is not of type <paramref name="flag" /> (exclusive).</returns>
 		/// <exception cref="IndexOutOfRangeException">No character that is not of type <paramref name="flag" /> is met.</exception>
-		protected string tokenw(int flag) {
+		protected string tokenw(CharCategory flag) {
 			int sp = Position;
 			while ((ct & flag) != 0) Position++;
-			return Source.Substring(sp, Position - sp);
+			return Source[sp..Position];
 		}
 		/// <summary>
 		/// Skips over whitespaces.
 		/// </summary>
 		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected void ws() {
-			while ((ct & 0x0001) != 0) Position++;
+			while ((ct & CharCategory.WhiteSpace) != 0) Position++;
 		}
 #pragma warning restore IDE1006
 
@@ -125,8 +124,8 @@ namespace Cryville.Common.Pdt {
 		/// <returns>An identifier.</returns>
 		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected string GetIdentifier() {
-			if ((ct & 0x0020) == 0) return "";
-			return tokenw(0x0010);
+			if ((ct & CharCategory.IdentifierBegin) == 0) return "";
+			return tokenw(CharCategory.Identifier);
 		}
 		/// <summary>
 		/// Reads a number.
@@ -134,7 +133,7 @@ namespace Cryville.Common.Pdt {
 		/// <returns>A number.</returns>
 		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected string GetNumber() {
-			return tokenw(0x0040);
+			return tokenw(CharCategory.Digit);
 		}
 		/// <summary>
 		/// Reads a string.
@@ -142,13 +141,15 @@ namespace Cryville.Common.Pdt {
 		/// <returns>A string.</returns>
 		/// <exception cref="IndexOutOfRangeException">The end of the source string is reached.</exception>
 		protected string GetString() {
-			int sp = Position;
-			do {
-				if (cc == '\\') Position++;
-				Position++;
-			} while (ct != 0x0100);
+			_sb.Clear();
 			Position++;
-			return Regex.Replace(Source.Substring(sp + 1, Position - sp - 2), @"\\(.)", "$1");
+			while (ct != CharCategory.StringDelimiter) {
+				if (cc == '\\') Position++;
+				_sb.Append(cc);
+				Position++;
+			}
+			Position++;
+			return _sb.ToString();
 		}
 		/// <summary>
 		/// Reads an expression.
@@ -162,7 +163,7 @@ namespace Cryville.Common.Pdt {
 			return new PdtExpression(ins);
 		}
 
-		readonly Dictionary<string, PdtExpression> defs = new Dictionary<string, PdtExpression>();
+		readonly Dictionary<string, PdtExpression> defs = new();
 		/// <summary>
 		/// Creates an instance of the <see cref="PdtInterpreter" /> class.
 		/// </summary>
@@ -185,8 +186,7 @@ namespace Cryville.Common.Pdt {
 		public object Interpret(Type type) {
 			try {
 				if (m_formatVersion == null) InterpretDirectives();
-				if (_binder == null)
-					_binder = BinderAttribute.CreateBinderOfType(type);
+				_binder ??= BinderAttribute.CreateBinderOfType(type);
 				return InterpretObject(type);
 			}
 			catch (Exception ex) {
@@ -201,7 +201,7 @@ namespace Cryville.Common.Pdt {
 				switch (GetIdentifier()) {
 					case "ver":
 						ws();
-						Logger.Log("main", 3, "PDT", "Legacy PDT directive #ver={0} found. Ignoring.", GetNumber());
+						Shared.Logger.Log(3, "PDT", "Legacy PDT directive #ver={0} found. Ignoring.", GetNumber());
 						break;
 					case "format":
 						ws();
@@ -228,8 +228,8 @@ namespace Cryville.Common.Pdt {
 			if (!flag) throw new FormatException("Format directive not found");
 		}
 		object InterpretObject(Type type) {
-			var result = ReflectionHelper.InvokeEmptyConstructor(type);
-			bool dictflag = typeof(IDictionary).IsAssignableFrom(type);
+			var result = Activator.CreateInstance(type);
+			bool pcflag = PairCollection.IsPairCollection(type);
 			while (true) {
 				try { ws(); }
 				catch (IndexOutOfRangeException) { return result; }
@@ -241,75 +241,58 @@ namespace Cryville.Common.Pdt {
 				char c = GetChar();
 				switch (c) {
 					case '{':
-						if (dictflag) {
-							var ktype = type.GetGenericArguments()[0];
-							var ptype = type.GetGenericArguments()[1];
-							object key = _binder.ChangeType(pkey, ktype, null);
-							object value = InterpretObject(ptype);
-							((IDictionary)result).Add(key, value);
-						}
-						else {
-							MemberInfo prop = null;
-							bool flag = false;
-							if (pkey is string) prop = ReflectionHelper.GetMember(type, (string)pkey);
-							if (prop == null) flag = ReflectionHelper.TryFindMemberWithAttribute<ElementListAttribute>(type, out prop);
-							if (prop == null) throw new MissingMemberException(string.Format("The property \"{0}\" is not found", pkey));
-							Type ptype = ReflectionHelper.GetMemberType(prop);
-							if (flag) {
-								using (var collection = new PairCollection(ReflectionHelper.GetValue(prop, result))) {
-									var ktype = ptype.GetGenericArguments()[0];
-									var vtype = ptype.GetGenericArguments()[1];
-									object key = _binder.ChangeType(pkey, ktype, null);
-									object value = InterpretObject(vtype);
-									collection.Add(key, value);
-								}
-							}
-							else ReflectionHelper.SetValue(prop, result, InterpretObject(ptype));
-						}
+						InterpretObjectInternal<ElementListAttribute>(pcflag, type, pkey, result, type => InterpretObject(type));
 						break;
 					case ':':
 					case ';':
-						var exp = c == ';' ? _emptyexp : GetExp();
-						if (dictflag) {
-							var ktype = type.GetGenericArguments()[0];
-							var vtype = type.GetGenericArguments()[1];
-							object key = _binder.ChangeType(pkey, ktype, null);
-							object value = _binder.ChangeType(exp, vtype, null);
-							((IDictionary)result).Add(key, value);
-						}
-						else {
-							MemberInfo prop = null;
-							bool flag = false;
-							if (pkey is string) prop = ReflectionHelper.GetMember(type, (string)pkey);
-							if (prop == null) flag = ReflectionHelper.TryFindMemberWithAttribute<PropertyListAttribute>(type, out prop);
-							if (prop == null) throw new MissingMemberException(string.Format("The property \"{0}\" is not found", pkey));
-							var ptype = ReflectionHelper.GetMemberType(prop);
-							if (flag) {
-								using (var collection = new PairCollection(ReflectionHelper.GetValue(prop, result))) {
-									var ktype = ptype.GetGenericArguments()[0];
-									var vtype = ptype.GetGenericArguments()[1];
-									object key = _binder.ChangeType(pkey, ktype, null);
-									object value = _binder.ChangeType(exp, vtype, null);
-									collection.Add(key, value);
-								}
-							}
-							else {
-								object value = _binder.ChangeType(exp, ptype, null);
-								ReflectionHelper.SetValue(prop, result, value, _binder);
-							}
-						}
+						var exp = c == ';' ? PdtExpression.Empty : GetExp();
+						InterpretObjectInternal<PropertyListAttribute>(pcflag, type, pkey, result, type => _binder.ChangeType(exp, type, null));
 						break;
 					default:
 						throw new InvalidOperationException("Internal error: Invalid key interpretation");
 				}
 			}
 		}
+		void InterpretObjectInternal<T>(bool pcflag, Type type, object pkey, object result, Func<Type, object> vfunc) where T : Attribute {
+			if (pcflag) {
+				using var collection = new PairCollection(result);
+				var ktype = type.GetGenericArguments()[0];
+				var ptype = type.GetGenericArguments()[1];
+				object key = _binder.ChangeType(pkey, ktype, null);
+				object value = vfunc(ptype);
+				collection.Add(key, value);
+			}
+			else {
+				MemberInfo prop = null;
+				bool flag = false;
+				if (pkey is string pname) prop = FieldLikeHelper.GetMember(type, pname);
+				if (prop == null) {
+					prop = FieldLikeHelper.FindMemberWithAttribute<T>(type);
+					flag = true;
+				}
+				if (prop == null) throw new MissingMemberException(string.Format("The property \"{0}\" is not found", pkey));
+				Type ptype = FieldLikeHelper.GetMemberType(prop);
+				if (flag) {
+					var origCollection = FieldLikeHelper.GetValue(prop, result);
+					if (origCollection == null) {
+						FieldLikeHelper.SetValue(prop, result, origCollection = Activator.CreateInstance(ptype));
+					}
+					using var collection = new PairCollection(origCollection);
+					var ktype = ptype.GetGenericArguments()[0];
+					var vtype = ptype.GetGenericArguments()[1];
+					object key = _binder.ChangeType(pkey, ktype, null);
+					object value = vfunc(vtype);
+					collection.Add(key, value);
+				}
+				else FieldLikeHelper.SetValue(prop, result, vfunc(ptype), _binder);
+			}
+		}
 		/// <summary>
 		/// Interprets a key from the current position.
 		/// </summary>
 		/// <returns>The interpreted key.</returns>
 		protected virtual object InterpretKey(Type type) {
-			return tokenb(0x1000).Trim();
+			return tokenb(CharCategory.EndOfKey).Trim();
 		}
 	}
 	/// <summary>
@@ -324,13 +307,13 @@ namespace Cryville.Common.Pdt {
 			int pos = interpreter.Position;
 			if (pos >= src.Length) return "Failed to interpret the PDT: There are some missing or redundant tokens";
 			int lineStartPos = src.LastIndexOf('\n', pos) + 1;
-			int previewStartPos = src.LastIndexOf('\n', pos, 64);
+			int previewStartPos = src.LastIndexOf('\n', pos, CMath.Min(64, pos));
 			if (previewStartPos == -1) {
 				previewStartPos = pos - 64;
 				if (previewStartPos < 0) previewStartPos = 0;
 			}
 			else previewStartPos++;
-			int previewEndPos = src.IndexOf('\n', pos, 64);
+			int previewEndPos = src.IndexOf('\n', pos, CMath.Min(64, src.Length - pos));
 			if (previewEndPos == -1) {
 				previewEndPos = pos + 64;
 				if (previewEndPos > src.Length) previewEndPos = src.Length;
@@ -340,7 +323,7 @@ namespace Cryville.Common.Pdt {
 				src.Take(interpreter.Position).Count(c => c == '\n') + 1,
 				pos - lineStartPos + 1,
 				innerException == null ? "Unknown error" : innerException.Message,
-				src.Substring(previewStartPos, previewEndPos - previewStartPos)
+				src[previewStartPos..previewEndPos]
 			);
 		}
 	}

Assets/Cryville/Common/Pdt/PdtOperator.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Cryville.Common.Pdt {
 	/// <summary>
@@ -91,7 +91,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="name">The name of the operator.</param>
 		/// <param name="paramCount">The parameter count.</param>
 		public PdtOperatorSignature(string name, int paramCount)
-			: this(IdentifierManager.SharedInstance.Request(name), paramCount) { }
+			: this(IdentifierManager.Shared.Request(name), paramCount) { }
 		/// <summary>
 		/// Creates an operator signature.
 		/// </summary>
@@ -102,18 +102,18 @@ namespace Cryville.Common.Pdt {
 			ParamCount = paramCount;
 			_hash = Name ^ ((ParamCount << 16) | (ParamCount >> 16));
 		}
-		public override bool Equals(object obj) {
-			if (!(obj is PdtOperatorSignature)) return false;
-			return Equals((PdtOperatorSignature)obj);
+		public override readonly bool Equals(object obj) {
+			if (obj is not PdtOperatorSignature other) return false;
+			return Equals(other);
 		}
-		public bool Equals(PdtOperatorSignature other) {
+		public readonly bool Equals(PdtOperatorSignature other) {
 			return Name == other.Name && ParamCount == other.ParamCount;
 		}
-		public override int GetHashCode() {
+		public override readonly int GetHashCode() {
 			return _hash;
 		}
-		public override string ToString() {
-			return string.Format("{0}({1})", IdentifierManager.SharedInstance.Retrieve(Name), ParamCount);
+		public override readonly string ToString() {
+			return string.Format("{0}({1})", IdentifierManager.Shared.Retrieve(Name), ParamCount);
 		}
 	}
-}
+}

Assets/Cryville/Common/Pdt/PdtVariableMemory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnsafeIL;
 
 namespace Cryville.Common.Pdt {
@@ -24,7 +24,7 @@ namespace Cryville.Common.Pdt {
 		/// Copies the memory in the span to another span.
 		/// </summary>
 		/// <param name="dest">The destination span.</param>
-		public void CopyTo(PdtVariableMemory dest) {
+		public readonly void CopyTo(PdtVariableMemory dest) {
 			CopyTo(dest._ptr, 0, Length);
 		}
 		/// <summary>
@@ -32,7 +32,7 @@ namespace Cryville.Common.Pdt {
 		/// </summary>
 		/// <param name="dest">The destination buffer.</param>
 		/// <param name="destOffset">The offset on the destination buffer to start copying to.</param>
-		public void CopyTo(byte[] dest, int destOffset) {
+		public readonly void CopyTo(byte[] dest, int destOffset) {
 			fixed (byte* ptr = dest) {
 				CopyTo(ptr, destOffset, Length);
 			}
@@ -44,13 +44,13 @@ namespace Cryville.Common.Pdt {
 		/// <param name="destOffset">The offset on the destination buffer to start copying to.</param>
 		/// <param name="length">The length to copy.</param>
 		/// <exception cref="ArgumentOutOfRangeException"><paramref name="length" /> is greater than the length of the span.</exception>
-		public void CopyTo(byte* dest, int destOffset, int length) {
+		public readonly void CopyTo(byte* dest, int destOffset, int length) {
 			if (length > Length) throw new ArgumentOutOfRangeException("length");
 			for (int i = 0; i < length; i++)
 				dest[destOffset + i] = _ptr[i];
 		}
 		/// <inheritdoc />
-		public bool Equals(PdtVariableMemory obj) {
+		public readonly bool Equals(PdtVariableMemory obj) {
 			if (Type != obj.Type || Length != obj.Length) return false;
 			for (int i = 0; i < Length; i++) {
 				if (*(_ptr + i) != *(obj._ptr + i)) return false;
@@ -63,7 +63,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="offset">The offset on the span to start reading from.</param>
 		/// <returns>A number.</returns>
 		/// <exception cref="InvalidCastException">The span at the offset does not represent a number.</exception>
-		public float AsNumber(int offset = 0) {
+		public readonly float AsNumber(int offset = 0) {
 			if (Type != PdtInternalType.Number && Type != PdtInternalType.Vector)
 				throw new InvalidCastException("Not a number");
 			float value;
@@ -79,7 +79,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="offset">The offset from the start of the span.</param>
 		/// <exception cref="InvalidCastException">The span at the offset does not represent a number.</exception>
 		/// <exception cref="InvalidOperationException">The length of the span is not sufficient.</exception>
-		public void SetNumber(float value, int offset = 0) {
+		public readonly void SetNumber(float value, int offset = 0) {
 			if (Type != PdtInternalType.Number && Type != PdtInternalType.Vector)
 				throw new InvalidCastException("Not a number");
 			if (Length < sizeof(float) + offset)
@@ -94,7 +94,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="offset">The offset on the span to start reading from.</param>
 		/// <returns>A string.</returns>
 		/// <exception cref="InvalidCastException">The span at the offset does not represent a string.</exception>
-		public string AsString(int offset = 0) {
+		public readonly string AsString(int offset = 0) {
 			if (Type != PdtInternalType.String && Type != PdtInternalType.Array)
 				throw new InvalidCastException("Not a string");
 			var len = *(int*)(_ptr + offset);
@@ -107,7 +107,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="offset">The offset from the start of the span.</param>
 		/// <exception cref="InvalidCastException">The span at the offset does not represent a string.</exception>
 		/// <exception cref="InvalidOperationException">The length of the span is not sufficient.</exception>
-		public void SetString(string value, int offset = 0) {
+		public readonly void SetString(string value, int offset = 0) {
 			if (Type != PdtInternalType.String && Type != PdtInternalType.Array)
 				throw new InvalidCastException("Not a string");
 			int strlen = value.Length;
@@ -124,7 +124,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="offset">The offset on the span to start reading from.</param>
 		/// <returns>The name of an undefined identifier.</returns>
 		/// <exception cref="InvalidCastException">The span does not represent an undefined identifier.</exception>
-		public int AsIdentifier(int offset = 0) {
+		public readonly int AsIdentifier(int offset = 0) {
 			if (Type != PdtInternalType.Undefined && Type != PdtInternalType.Array)
 				throw new InvalidCastException("Not an identifier");
 			return *(int*)(_ptr + offset);
@@ -140,7 +140,7 @@ namespace Cryville.Common.Pdt {
 		/// <remarks>
 		/// <para>Use <see cref="AsNumber(int)" /> instead while reading an unaligned number.</para>
 		/// </remarks>
-		public T As<T>(int offset = 0) {
+		public readonly T As<T>(int offset = 0) {
 			var len = Unsafe.SizeOf<T>();
 			if (offset >= Length)
 				throw new ArgumentOutOfRangeException("offset");
@@ -159,7 +159,7 @@ namespace Cryville.Common.Pdt {
 		/// <remarks>
 		/// <para>Use <see cref="SetNumber(float, int)" /> instead while writing an unaligned number.</para>
 		/// </remarks>
-		public void Set<T>(T value, int offset = 0) {
+		public readonly void Set<T>(T value, int offset = 0) {
 			var len = Unsafe.SizeOf<T>();
 			if (offset >= Length)
 				throw new ArgumentOutOfRangeException("offset");
@@ -173,7 +173,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="arrtype">The type of the array.</param>
 		/// <param name="pc">The item count of the array.</param>
 		/// <exception cref="InvalidCastException">The span does not represent an array.</exception>
-		public void GetArraySuffix(out int arrtype, out int pc) {
+		public readonly void GetArraySuffix(out int arrtype, out int pc) {
 			if (Type != PdtInternalType.Vector && Type != PdtInternalType.Array)
 				throw new InvalidCastException("Not an array or vector");
 			arrtype = *(int*)(_ptr + Length - sizeof(int));
@@ -186,7 +186,7 @@ namespace Cryville.Common.Pdt {
 		/// <param name="arrtype">The type of the array.</param>
 		/// <param name="pc">The item count of the array.</param>
 		/// <exception cref="InvalidCastException">The span does not represent an array.</exception>
-		public void SetArraySuffix(int arrtype, int pc = 0) {
+		public readonly void SetArraySuffix(int arrtype, int pc = 0) {
 			if (Type != PdtInternalType.Vector && Type != PdtInternalType.Array)
 				throw new InvalidCastException("Not an array or vector");
 			*(int*)(_ptr + Length - sizeof(int)) = arrtype;

Assets/Cryville/Common/Qualified.cs

@@ -0,0 +1,28 @@
+using System;
+
+namespace Cryville.Common {
+	public struct Qualified<T> : IFormattable where T : IConvertible {
+		static readonly string _prefixes = "yzafpnμm kMGTPEZY";
+		public T Value { get; set; }
+		public string Unit { get; set; }
+
+		public Qualified(string unit) : this(default, unit) { }
+		public Qualified(T value, string unit) {
+			Value = value;
+			Unit = unit;
+		}
+
+		public override readonly string ToString() { return ToString("G3"); }
+		public readonly string ToString(string format) { return ToString(format, null); }
+		public readonly string ToString(string format, IFormatProvider formatProvider) {
+			double value = Value.ToDouble(formatProvider);
+			int expIndex = (int)System.Math.Log10(value) / 3;
+			if (expIndex == 0) {
+				return value.ToString(format, formatProvider) + Unit;
+			}
+			int prefixIndex = System.Math.Clamp(expIndex + 8, 0, _prefixes.Length - 1);
+			value /= System.Math.Pow(1e3, prefixIndex - 8);
+			return value.ToString(format, formatProvider) + _prefixes[prefixIndex] + Unit;
+		}
+	}
+}

Assets/Cryville/Common/Qualified.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2b7b45ff20c33ac47b476371673b037c
+guid: 909a28e78d4239f4c9507c3c9128baf2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/ReflectionHelper.cs

@@ -1,186 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-
-namespace Cryville.Common {
-	/// <summary>
-	/// Provides a set of <see langword="static" /> methods for refletion.
-	/// </summary>
-	public static class ReflectionHelper {
-		static readonly Type[] emptyTypeArray = {};
-		/// <summary>
-		/// Gets the parameterless constructor of a type.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>The parameterless constructor of the type.</returns>
-		public static ConstructorInfo GetEmptyConstructor(Type type) {
-			return type.GetConstructor(emptyTypeArray);
-		}
-		static readonly object[] emptyObjectArray = {};
-		/// <summary>
-		/// Invokes the parameterless constructor of a type and returns the result.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>The created instance.</returns>
-		public static object InvokeEmptyConstructor(Type type) {
-			return GetEmptyConstructor(type).Invoke(emptyObjectArray);
-		}
-		
-		/// <summary>
-		/// Tries to find a member with the specified attribute type in a type.
-		/// </summary>
-		/// <typeparam name="T">The attribute type.</typeparam>
-		/// <param name="t">The type containing the member with the specified attribute type.</param>
-		/// <param name="mi">The member.</param>
-		/// <returns>Whether the member is found.</returns>
-		public static bool TryFindMemberWithAttribute<T>(Type t, out MemberInfo mi) where T : Attribute {
-			try {
-				mi = FindMemberWithAttribute<T>(t);
-				return true;
-			}
-			catch (MissingMemberException) {
-				mi = null;
-				return false;
-			}
-		}
-		/// <summary>
-		/// Finds a member with the specified attribute type in a type.
-		/// </summary>
-		/// <typeparam name="T">The attribute type.</typeparam>
-		/// <param name="type">The type containing the member with the specified attribute type.</param>
-		/// <returns></returns>
-		/// <exception cref="MissingMemberException">The member is not found or multiple members are found.</exception>
-		public static MemberInfo FindMemberWithAttribute<T>(Type type) where T : Attribute {
-			var mil = type.FindMembers(
-				MemberTypes.Field | MemberTypes.Property,
-				BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static,
-				(m, o) => m.GetCustomAttributes(typeof(T), true).Length != 0,
-				null
-			);
-			if (mil.Length != 1)
-				throw new MissingMemberException(type.Name, typeof(T).Name);
-			return mil[0];
-		}
-
-		/// <summary>
-		/// Gets whether a type is a <see cref="Dictionary{TKey, TValue}" />.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>Whether the type is a <see cref="Dictionary{TKey, TValue}" />.</returns>
-		public static bool IsGenericDictionary(Type type) {
-			return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Dictionary<,>);
-		}
-
-		/// <summary>
-		/// Gets the member from a type with the specified name.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <param name="name">The name of the member.</param>
-		/// <returns>The member.</returns>
-		/// <exception cref="MissingMemberException">The member is not found or multiple members are found.</exception>
-		public static MemberInfo GetMember(Type type, string name) {
-			var mil = type.GetMember(
-				name,
-				MemberTypes.Field | MemberTypes.Property,
-				BindingFlags.Public | BindingFlags.Instance
-			);
-			if (mil.Length != 1)
-				throw new MissingMemberException(type.Name, name);
-			return mil[0];
-		}
-
-		/// <summary>
-		/// Gets the type of a member.
-		/// </summary>
-		/// <param name="mi">The member.</param>
-		/// <returns>The type of the member.</returns>
-		/// <exception cref="ArgumentException"><paramref name="mi" /> is not a field or a property.</exception>
-		public static Type GetMemberType(MemberInfo mi) {
-			if (mi is FieldInfo)
-				return ((FieldInfo)mi).FieldType;
-			if (mi is PropertyInfo)
-				return ((PropertyInfo)mi).PropertyType;
-			else
-				throw new ArgumentException("Member is not field or property.");
-		}
-
-		/// <summary>
-		/// Gets the value of a member of an object.
-		/// </summary>
-		/// <param name="mi">The member.</param>
-		/// <param name="obj">The object.</param>
-		/// <returns>The value.</returns>
-		/// <exception cref="ArgumentException"><paramref name="mi" /> is not a field or a property.</exception>
-		public static object GetValue(MemberInfo mi, object obj) {
-			if (mi is FieldInfo)
-				return ((FieldInfo)mi).GetValue(obj);
-			else if (mi is PropertyInfo)
-				return ((PropertyInfo)mi).GetValue(obj, new object[]{});
-			else
-				throw new ArgumentException();
-		}
-
-		/// <summary>
-		/// Sets the value of a member of an object.
-		/// </summary>
-		/// <param name="mi">The member.</param>
-		/// <param name="obj">The object.</param>
-		/// <param name="value">The value.</param>
-		/// <param name="binder">An optional binder to convert the value.</param>
-		/// <exception cref="ArgumentException"><paramref name="mi" /> is not a field or a property.</exception>
-		public static void SetValue(MemberInfo mi, object obj, object value, Binder binder = null) {
-			if (mi is FieldInfo)
-				((FieldInfo)mi).SetValue(obj, value, BindingFlags.Default, binder, null);
-			else if (mi is PropertyInfo)
-				((PropertyInfo)mi).SetValue(obj, value, BindingFlags.Default, binder, emptyObjectArray, null);
-			else
-				throw new ArgumentException();
-		}
-
-		/// <summary>
-		/// Gets all the subclasses of a type in the current app domain.
-		/// </summary>
-		/// <typeparam name="T">The type.</typeparam>
-		/// <returns>An array containing all the subclasses of the type in the current app domain.</returns>
-		public static Type[] GetSubclassesOf<T>() where T : class {
-			var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-			IEnumerable<Type> r = Enumerable.Empty<Type>();
-			foreach (var a in assemblies)
-				r = r.Concat(a.GetTypes().Where(
-					t => t.IsClass
-					&& !t.IsAbstract
-					&& t.IsSubclassOf(typeof(T))
-				));
-			return r.ToArray();
-		}
-
-		/// <summary>
-		/// Gets a simple name of a type.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>A simple name of the class.</returns>
-		public static string GetSimpleName(Type type) {
-			string result = type.Name;
-			var typeargs = type.GetGenericArguments();
-			if (typeargs.Length > 0) {
-				result = string.Format("{0}[{1}]", result, string.Join(",", from a in typeargs select GetSimpleName(a)));
-			}
-			return result;
-		}
-
-		/// <summary>
-		/// Gets the namespace qualified name of a type.
-		/// </summary>
-		/// <param name="type">The type.</param>
-		/// <returns>The namespace qualified name of the class.</returns>
-		public static string GetNamespaceQualifiedName(Type type) {
-			string result = type.Namespace + "." + type.Name;
-			var typeargs = type.GetGenericArguments();
-			if (typeargs.Length > 0) {
-				result = string.Format("{0}[{1}]", result, string.Join(",", from a in typeargs select GetNamespaceQualifiedName(a)));
-			}
-			return result;
-		}
-	}
-}

Assets/Cryville/Common/ReflectionHelper.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 16857d076fc8d534788424e6c6d180e0
-timeCreated: 1608801352
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: