ci: Update Cryville.Audio (Amend)

Assets/Cryville/Common/AsyncDelivery.cs

@@ -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

@@ -35,8 +35,8 @@ namespace Cryville.Common {
 				return null;
 			else if (type.IsAssignableFrom(value.GetType()))
 				return value;
-			else if (type.IsEnum && value is string) {
+			else if (type.IsEnum && value is string strValue) {
-				return Enum.Parse(type, (string)value);
+				return Enum.Parse(type, strValue);
 			}
 			throw new InvalidCastException(string.Format("Cannot cast {0} to {1}", value.GetType(), type));
 		}

Assets/Cryville/Common/Coroutine.cs

@@ -4,7 +4,7 @@ using System.Diagnostics;
 namespace Cryville.Common {
 	public class Coroutine {
 		readonly IEnumerator<float> _enumerator;
-		readonly Stopwatch _stopwatch = new Stopwatch();
+		readonly Stopwatch _stopwatch = new();
 		public float Progress { get; private set; }
 		public Coroutine(IEnumerator<float> enumerator) {
 			_enumerator = enumerator;

Assets/Cryville/Common/Font/FontFile.cs

@@ -16,13 +16,11 @@ namespace Cryville.Common.Font {
 		}
 		public void Close() { Reader.Close(); }
 
-		public static FontFile Create(FileInfo file) {
+		public static FontFile Create(FileInfo file) => file.Extension switch {
-			switch (file.Extension) {
+			".ttf" or ".otf" => new FontFileTTF(file),
-				case ".ttf": case ".otf": return new FontFileTTF(file);
+			".ttc" or ".otc" => new FontFileTTC(file),
-				case ".ttc": case ".otc": return new FontFileTTC(file);
+			_ => null,
-				default: return 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

@@ -17,8 +17,7 @@ namespace Cryville.Common.Font {
 					Shared.Logger.Log(3, "UI", "Discarding a font with a duplicate full name {0}", f.FullName);
 					continue;
 				}
-				List<Typeface> set2;
+				if (!map2.TryGetValue(f.FamilyName, out List<Typeface> set2)) {
-				if (!map2.TryGetValue(f.FamilyName, out set2)) {
 					map2.Add(f.FamilyName, set2 = new List<Typeface>());
 				}
 				set2.Add(f);

Assets/Cryville/Common/Font/FontMatcher.cs

@@ -12,7 +12,7 @@ namespace Cryville.Common.Font {
 	public class FallbackListFontMatcher : FontMatcher {
 		readonly LanguageMatching _matcher;
 		static readonly string UltimateFallbackScript = "zzzz";
-		public Dictionary<string, List<string>> MapScriptToTypefaces = new Dictionary<string, List<string>>();
+		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>());
@@ -57,6 +57,7 @@ namespace Cryville.Common.Font {
 				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");
@@ -332,8 +333,7 @@ namespace Cryville.Common.Font {
 					yield return typeface1;
 				}
 				if (distinctFamily) continue;
-				IReadOnlyCollection<Typeface> typefaces2;
+				if (Manager.MapNameToTypefaces.TryGetValue(candidate, out IReadOnlyCollection<Typeface> typefaces2)) {
-				if (Manager.MapNameToTypefaces.TryGetValue(candidate, out typefaces2)) {
 					foreach (var typeface in typefaces2) {
 						if (typeface1 == typeface) continue;
 						yield return typeface;

Assets/Cryville/Common/Font/FontTable.cs

@@ -25,7 +25,7 @@ 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;
@@ -61,7 +61,7 @@ namespace Cryville.Common.Font {
 		readonly UInt16 entrySelector;
 		readonly UInt16 rangeShift;
 #pragma warning restore IDE0052 // Reserved
-		readonly List<TableRecord> tableRecords = new List<TableRecord>();
+		readonly List<TableRecord> tableRecords = new();
 		public TableDirectory(BinaryReader reader, UInt32 offset) : base(reader, offset) {
 			sfntVersion = reader.ReadUInt32();
 			if (sfntVersion != 0x00010000 && sfntVersion != 0x4F54544F &&
@@ -81,13 +81,11 @@ namespace Cryville.Common.Font {
 		public override IReadOnlyList<TableRecord> GetItems() {
 			return tableRecords;
 		}
-		public override object GetSubTable(TableRecord item) {
+		public override object GetSubTable(TableRecord item) => item.tableTag switch {
-			switch (item.tableTag) {
+			"name" => new NameTable(Reader, item.offset),
-				case "name": return new NameTable(Reader, item.offset);
+			"meta" => new MetaTable(Reader, item.offset),
-				case "meta": return new MetaTable(Reader, item.offset);
+			_ => throw new NotImplementedException(),
-				default: throw new NotImplementedException();
+		};
-			}
-		}
 	}
 	public struct TableRecord {
 		public string tableTag;
@@ -99,9 +97,9 @@ 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();
@@ -213,7 +211,7 @@ namespace Cryville.Common.Font {
 		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();

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

@@ -2,26 +2,26 @@ 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.Shared.Retrieve(Key); } }
+		public readonly object Name => IdentifierManager.Shared.Retrieve(Key);
 		public Identifier(int key) {
 			Key = key;
 		}
 		public Identifier(object name) {
 			Key = IdentifierManager.Shared.Request(name);
 		}
-		public override bool Equals(object obj) {
+		public override readonly bool Equals(object obj) {
-			if (obj == null || !(obj is Identifier)) return false;
+			if (obj == null || obj is not Identifier other) return false;
-			return Equals((Identifier)obj);
+			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/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/Network.meta

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

Assets/Cryville/Common/Network/Http11/Http11Client.cs

@@ -1,156 +0,0 @@
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net.Sockets;
-using System.Text;
-
-namespace Cryville.Common.Network.Http11 {
-	public class Http11Client : IDisposable {
-		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 const 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 Http11Client(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);
-			Shared.Logger.Log(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 void Dispose() {
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		public virtual void Dispose(bool disposing) {
-			if (disposing) {
-				Close();
-			}
-		}
-
-		public Http11Response Request(string method, Uri uri, string body = null, Encoding encoding = null) {
-			string struri = GetUri(uri).PathAndQuery;
-			return Request(Stream, method, struri, body, encoding);
-		}
-		
-		Http11Response Request(Stream stream, string method, string uri, string body = null, Encoding encoding = null) {
-			var headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-			foreach (var h in Headers)
-				headers.Add(h.Key, h.Value);
-			headers["Host"] = _baseUri.Host;
-			byte[] payload = null;
-			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));
-			}
-			using (var writer = new StreamWriter(stream, Encoding.ASCII, 1024, true)) {
-				writer.Write(method);
-				writer.Write(' ');
-				writer.Write(uri);
-				writer.Write(' ');
-				writer.Write(Version);
-				writer.Write("\r\n");
-				foreach (var header in headers) {
-					writer.Write(header.Key);
-					writer.Write(':');
-					writer.Write(header.Value);
-					writer.Write("\r\n");
-				}
-				writer.Write("\r\n");
-				if (payload != null) writer.Write(payload);
-				writer.Flush();
-			}
-			var response = new Http11Response(stream);
-			Shared.Logger.Log(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/Http11/Http11Response.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-
-namespace Cryville.Common.Network.Http11 {
-	public class Http11Response : IDisposable {
-		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 Http11ResponseStream MessageBody { get; private set; }
-		internal Http11Response(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];
-			Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-			while (ParseHeader(reader, Headers)) ;
-			if (Headers.ContainsKey("content-length")) {
-				int length = int.Parse(Headers["content-length"]);
-				MessageBody = new Http11ResponseBlockStream(reader, length);
-			}
-			else if (Headers.ContainsKey("transfer-encoding") && Headers["transfer-encoding"] == "chunked") {
-				MessageBody = new Http11ResponseChunkedStream(reader);
-			}
-		}
-
-		public void Dispose() {
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		public virtual void Dispose(bool disposing) {
-			if (disposing) {
-				MessageBody.Dispose();
-			}
-		}
-
-		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(':', 2);
-			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);
-			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/Http11/Http11ResponseStream.cs

@@ -1,130 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-
-namespace Cryville.Common.Network.Http11 {
-	public abstract class Http11ResponseStream : 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 Http11ResponseBlockStream : Http11ResponseStream {
-		readonly BinaryReader _reader;
-		readonly int _length;
-		int _pos = 0;
-		internal Http11ResponseBlockStream(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);
-			}
-			_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 Http11ResponseChunkedStream : Http11ResponseStream {
-		readonly BinaryReader _reader;
-		byte[] _chunk = null;
-		int _pos = 0;
-		internal Http11ResponseChunkedStream(BinaryReader reader) {
-			_reader = reader;
-			ReadChunk();
-		}
-		public void ReadChunk() {
-			if (_chunk != null && _chunk.Length == 0) return;
-			string[] chunkHeader = Http11Response.ReadLine(_reader).Split(';');
-			int chunkSize;
-			if (!int.TryParse(chunkHeader[0], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out chunkSize))
-				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 (Http11Response.ParseHeader(_reader, headers)) ;
-				return;
-			}
-			_chunk = new byte[chunkSize];
-			int recv = 0;
-			while (recv < chunkSize) {
-				recv += _reader.Read(_chunk, recv, chunkSize - recv);
-			}
-			_pos = 0;
-			if (Http11Response.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/Http11/Https11Client.cs

@@ -1,33 +0,0 @@
-using System;
-using System.IO;
-
-namespace Cryville.Common.Network.Http11 {
-	public class Https11Client : Http11Client {
-		readonly TlsClient _tlsClient;
-		
-		protected override Stream Stream {
-			get {
-				return _tlsClient.Stream;
-			}
-		}
-		protected override string WindowsProxyProtocolName {
-			get {
-				return "https";
-			}
-		}
-
-		public Https11Client(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/TlsClient.cs

@@ -1,96 +0,0 @@
-using Org.BouncyCastle.Security;
-using Org.BouncyCastle.Tls;
-using Org.BouncyCastle.Tls.Crypto;
-using Org.BouncyCastle.Tls.Crypto.Impl.BC;
-using System;
-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 : IDisposable {
-		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();
-		}
-
-		public void Dispose() {
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		public virtual void Dispose(bool disposing) {
-			if (disposing) {
-				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();
-			}
-		}
-
-		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/PdtEvaluatorBase.cs

@@ -56,9 +56,9 @@ namespace Cryville.Common.Pdt {
 			while (ip != null) {
 				bool nextFlag = false;
 				var i = ip.Value;
-				if (i is PdtInstruction.Operate) {
+				if (i is PdtInstruction.Operate iop) {
 					int fc0 = _framecount;
-					int fc1 = ((PdtInstruction.Operate)i).Signature.ParamCount;
+					int fc1 = iop.Signature.ParamCount;
 					try { i.Execute(this, ref ip); } catch (Exception) { }
 					if (fc0 - _framecount == fc1) {
 						unsafe {
@@ -77,8 +77,7 @@ namespace Cryville.Common.Pdt {
 						}
 					}
 				}
-				else if (i is PdtInstruction.Collapse) {
+				else if (i is PdtInstruction.Collapse t) {
-					var t = (PdtInstruction.Collapse)i;
 					try {
 						var pins = ip;
 						i.Execute(this, ref ip);
@@ -133,15 +132,14 @@ namespace Cryville.Common.Pdt {
 			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;
 					break;
 				}
 			}
 		}
 		void ReplaceIP(LinkedList<PdtInstruction> il, ref LinkedListNode<PdtInstruction> ip, PdtInstruction ins, Dictionary<LinkedListNode<PdtInstruction>, List<PdtInstruction.Collapse>> cols) {
-			List<PdtInstruction.Collapse> cins;
+			if (cols.TryGetValue(ip, out List<PdtInstruction.Collapse> cins)) cols.Remove(ip);
-			if (cols.TryGetValue(ip, out cins)) cols.Remove(ip);
 			ip = il.AddAfter(ip, ins);
 			il.Remove(ip.Previous);
 			if (cins != null) cols.Add(ip, cins);
@@ -163,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 byte[] value);
-				GetVariable(name, forced, out frame->Type, out value);
 				frame->Offset = _goffset;
 				frame->Length = value.Length;
 				Array.Copy(value, 0, _mem, _goffset, value.Length);

Assets/Cryville/Common/Pdt/PdtExpression.cs

@@ -114,7 +114,7 @@ namespace Cryville.Common.Pdt {
 		}
 	}
 	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 },
@@ -125,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 },
@@ -153,10 +153,10 @@ namespace Cryville.Common.Pdt {
 		private struct PdtExpToken {
 			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 {
+			public static readonly PdtExpToken EmptyOperator = new() {
 				Type = CharCategory.Operator,
 				Value = "$",
 			};
@@ -249,13 +249,12 @@ namespace Cryville.Common.Pdt {
 			PdtExpToken? buf = null;
 			while (true) {
 				if (buf != null && t.Type != CharCategory.OpeningBracket) {
-					PdtExpression def;
+					if (defs.TryGetValue(buf.Value.Value, out PdtExpression def)) {
-					if (defs.TryGetValue(buf.Value.Value, out 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;

Assets/Cryville/Common/Pdt/PdtInterpreter.cs

@@ -65,7 +65,7 @@ namespace Cryville.Common.Pdt {
 		/// </summary>
 		public int Position { get; protected set; }
 
-		readonly StringBuilder _sb = new StringBuilder();
+		readonly StringBuilder _sb = new();
 #pragma warning disable IDE1006
 		/// <summary>
 		/// The character at the current position.
@@ -86,7 +86,7 @@ namespace Cryville.Common.Pdt {
 		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.
@@ -97,7 +97,7 @@ namespace Cryville.Common.Pdt {
 		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.
@@ -163,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>
@@ -186,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) {
@@ -256,18 +255,17 @@ namespace Cryville.Common.Pdt {
 		}
 		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)) {
+				using var collection = new PairCollection(result);
-					var ktype = type.GetGenericArguments()[0];
+				var ktype = type.GetGenericArguments()[0];
-					var ptype = type.GetGenericArguments()[1];
+				var ptype = type.GetGenericArguments()[1];
-					object key = _binder.ChangeType(pkey, ktype, null);
+				object key = _binder.ChangeType(pkey, ktype, null);
-					object value = vfunc(ptype);
+				object value = vfunc(ptype);
-					collection.Add(key, value);
+				collection.Add(key, value);
-				}
 			}
 			else {
 				MemberInfo prop = null;
 				bool flag = false;
-				if (pkey is string) prop = FieldLikeHelper.GetMember(type, (string)pkey);
+				if (pkey is string pname) prop = FieldLikeHelper.GetMember(type, pname);
 				if (prop == null) {
 					prop = FieldLikeHelper.FindMemberWithAttribute<T>(type);
 					flag = true;
@@ -279,13 +277,12 @@ namespace Cryville.Common.Pdt {
 					if (origCollection == null) {
 						FieldLikeHelper.SetValue(prop, result, origCollection = Activator.CreateInstance(ptype));
 					}
-					using (var collection = new PairCollection(origCollection)) {
+					using var collection = new PairCollection(origCollection);
-						var ktype = ptype.GetGenericArguments()[0];
+					var ktype = ptype.GetGenericArguments()[0];
-						var vtype = ptype.GetGenericArguments()[1];
+					var vtype = ptype.GetGenericArguments()[1];
-						object key = _binder.ChangeType(pkey, ktype, null);
+					object key = _binder.ChangeType(pkey, ktype, null);
-						object value = vfunc(vtype);
+					object value = vfunc(vtype);
-						collection.Add(key, value);
+					collection.Add(key, value);
-					}
 				}
 				else FieldLikeHelper.SetValue(prop, result, vfunc(ptype), _binder);
 			}
@@ -326,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

@@ -102,17 +102,17 @@ namespace Cryville.Common.Pdt {
 			ParamCount = paramCount;
 			_hash = Name ^ ((ParamCount << 16) | (ParamCount >> 16));
 		}
-		public override bool Equals(object obj) {
+		public override readonly bool Equals(object obj) {
-			if (!(obj is PdtOperatorSignature)) return false;
+			if (obj is not PdtOperatorSignature other) return false;
-			return Equals((PdtOperatorSignature)obj);
+			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() {
+		public override readonly string ToString() {
 			return string.Format("{0}({1})", IdentifierManager.Shared.Retrieve(Name), ParamCount);
 		}
 	}

Assets/Cryville/Common/Pdt/PdtVariableMemory.cs

@@ -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

@@ -6,15 +6,15 @@ namespace Cryville.Common {
 		public T Value { get; set; }
 		public string Unit { get; set; }
 
-		public Qualified(string unit) : this(default(T), unit) { }
+		public Qualified(string unit) : this(default, unit) { }
 		public Qualified(T value, string unit) {
 			Value = value;
 			Unit = unit;
 		}
 
-		public override string ToString() { return ToString("G3"); }
+		public override readonly string ToString() { return ToString("G3"); }
-		public string ToString(string format) { return ToString(format, null); }
+		public readonly string ToString(string format) { return ToString(format, null); }
-		public string ToString(string format, IFormatProvider formatProvider) {
+		public readonly string ToString(string format, IFormatProvider formatProvider) {
 			double value = Value.ToDouble(formatProvider);
 			int expIndex = (int)System.Math.Log10(value) / 3;
 			if (expIndex == 0) {

Assets/Cryville/Common/Shared.cs

@@ -2,6 +2,6 @@ using Cryville.Common.Logging;
 
 namespace Cryville.Common {
 	public static class Shared {
-		public static readonly Logger Logger = new Logger();
+		public static readonly Logger Logger = new();
 	}
 }

Assets/Cryville/Common/StringUtils.cs

@@ -13,7 +13,7 @@ namespace Cryville.Common {
 		/// <param name="s">The file name or file path.</param>
 		/// <returns>The file name or file path with the extension removed.</returns>
 		public static string TrimExt(string s) {
-			return s.Substring(0, s.LastIndexOf("."));
+			return s[..s.LastIndexOf(".")];
 		}
 		/// <summary>
 		/// Converts the value of a <see cref="TimeSpan" /> to a human-readable string.
@@ -52,12 +52,12 @@ namespace Cryville.Common {
 		public static string GetProcessPathFromCommand(string command) {
 			command = command.Trim();
 			if (command[0] == '"') {
-				return command.Substring(1, command.IndexOf('"', 1) - 1);
+				return command[1..command.IndexOf('"', 1)];
 			}
 			else {
 				int e = command.IndexOf(' ');
 				if (e == -1) return command;
-				else return command.Substring(0, e);
+				else return command[..e];
 			}
 		}
 	}

Assets/Cryville/Common/Unity/NetworkTaskWorker.cs

@@ -16,7 +16,7 @@ namespace Cryville.Common.Unity {
 	public class NetworkTaskWorker {
 		bool suspended;
 		NetworkTask currentNetworkTask;
-		readonly Queue<NetworkTask> networkTasks = new Queue<NetworkTask>();
+		readonly Queue<NetworkTask> networkTasks = new();
 
 		/// <summary>
 		/// Current queued task count.

Assets/Cryville/Common/Unity/StateTweener.cs

@@ -30,13 +30,13 @@ namespace Cryville.Common.Unity {
 			[SerializeField]
 			public string Attribute;
 
-			public bool Equals(AttributeBinding other) {
+			public readonly bool Equals(AttributeBinding other) {
 				return Component.Equals(other.Component) && Attribute.Equals(other.Attribute);
 			}
-			public override bool Equals(object obj) {
+			public override readonly bool Equals(object obj) {
-				return obj is AttributeBinding && Equals((AttributeBinding)obj);
+				return obj is AttributeBinding other && Equals(other);
 			}
-			public override int GetHashCode() {
+			public override readonly int GetHashCode() {
 				return Component.GetHashCode() ^ Attribute.GetHashCode();
 			}
 		}
@@ -44,10 +44,10 @@ namespace Cryville.Common.Unity {
 		[SerializeField]
 		StateTweener[] m_children;
 
-		readonly List<string> _statePriority = new List<string>();
+		readonly List<string> _statePriority = new();
-		readonly Dictionary<AttributeBinding, object> _defaults = new Dictionary<AttributeBinding, object>();
+		readonly Dictionary<AttributeBinding, object> _defaults = new();
-		readonly Dictionary<AttributeBinding, PropertyTweener<object>> _tweeners = new Dictionary<AttributeBinding, PropertyTweener<object>>();
+		readonly Dictionary<AttributeBinding, PropertyTweener<object>> _tweeners = new();
-		readonly Dictionary<string, Dictionary<AttributeBinding, object>> _runtimeStates = new Dictionary<string, Dictionary<AttributeBinding, object>>();
+		readonly Dictionary<string, Dictionary<AttributeBinding, object>> _runtimeStates = new();
 
 		void Awake() {
 			var types = new Dictionary<AttributeBinding, Type>();
@@ -130,7 +130,7 @@ namespace Cryville.Common.Unity {
 			foreach (var tweener in _tweeners) tweener.Value.Advance(Time.deltaTime);
 		}
 
-		readonly List<string> m_cState = new List<string>();
+		readonly List<string> m_cState = new();
 		public IReadOnlyList<string> CurrentState => m_cState;
 		public void ClearState(float transitionDuration = float.Epsilon) {
 			foreach (var child in m_children) child.ClearState(transitionDuration);
@@ -161,7 +161,7 @@ namespace Cryville.Common.Unity {
 			if (index < 0) return;
 			m_cState.RemoveAt(index);
 			if (index < m_cState.Count) return;
-			var attrs = m_cState.Count == 0 ? _defaults : _runtimeStates[m_cState[m_cState.Count - 1]];
+			var attrs = m_cState.Count == 0 ? _defaults : _runtimeStates[m_cState[^1]];
 			foreach (var tweener in _tweeners) {
 				tweener.Value.Start(attrs[tweener.Key], transitionDuration);
 			}

Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs

@@ -0,0 +1,18 @@
+using UnityEngine;
+
+namespace Cryville.Common.Unity.UI {
+	[ExecuteAlways]
+	[RequireComponent(typeof(CanvasRenderer))]
+	public class CanvasRendererColorLinker : MonoBehaviour {
+		[SerializeField] CanvasRenderer m_source;
+		CanvasRenderer _target;
+
+		void Awake() {
+			_target = GetComponent<CanvasRenderer>();
+		}
+		void Update() {
+			if (m_source == null) return;
+			_target.SetColor(m_source.GetColor());
+		}
+	}
+}

Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 49a8d5b9869e5bb42bafbe71f84fecc5
+guid: 5f490a9cc1b652746b3062810e200ec5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Common/Unity/UI/ScrollableItemGrid.cs

@@ -113,7 +113,7 @@ namespace Cryville.Common.Unity.UI {
 		private bool initialized;
 		private GameObject[][] lines;
 		private int[] refl;
-		Vector2 cpos = new Vector2(0, 1);
+		Vector2 cpos = new(0, 1);
 		Vector2 pprectsize;
 
 #pragma warning disable IDE0051

Assets/Cryville/Common/Unity/UI/TMPAutoFont.cs

@@ -35,8 +35,7 @@ namespace Cryville.Common.Unity.UI {
 							if (MaxFallbackCount <= 0) break;
 						}
 						else {
-							if (_font.fallbackFontAssetTable == null)
+							_font.fallbackFontAssetTable ??= new List<FontAsset>();
-								_font.fallbackFontAssetTable = new List<FontAsset>();
 							_font.fallbackFontAssetTable.Add(ifont);
 							Shared.Logger.Log(1, "UI", "Using fallback font #{0}: {1}", _font.fallbackFontAssetTable.Count, typeface.FullName);
 							if (_font.fallbackFontAssetTable.Count >= MaxFallbackCount) break;

Assets/Cryville/Common/Unity/UrlOpener.cs

@@ -1,8 +1,22 @@
+using System;
+using System.Runtime.InteropServices;
+
 namespace Cryville.Common.Unity {
 	public static class UrlOpener {
 		public static void Open(string url) {
 #if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
-			System.Diagnostics.Process.Start(url);
+			url += "\0";
+			unsafe {
+				fixed (char* lpFile = url) {
+					var info = new SHELLEXECUTEINFOW {
+						cbSize = (uint)sizeof(SHELLEXECUTEINFOW),
+						fMask = 0x0540,
+						lpFile = lpFile,
+						nShow = 1,
+					};
+					ShellExecuteExW(ref info);
+				}
+			}
 #elif UNITY_ANDROID
 			using (var clazz = new UnityEngine.AndroidJavaClass("world.cryville.common.unity.UrlOpener")) {
 				clazz.CallStatic("open", url);
@@ -22,5 +36,27 @@ namespace Cryville.Common.Unity {
 #error Unknown platform.
 #endif
 		}
+
+#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
+		[DllImport("shell32.dll")]
+		static extern void ShellExecuteExW(ref SHELLEXECUTEINFOW pExecInfo);
+		unsafe struct SHELLEXECUTEINFOW {
+			public uint cbSize;
+			public uint fMask;
+			public IntPtr hwnd;
+			public char* lpVerb;
+			public char* lpFile;
+			public char* lpParameters;
+			public char* lpDirectory;
+			public int nShow;
+			public IntPtr hInstApp;
+			public IntPtr lpIDList;
+			public IntPtr lpClass;
+			public IntPtr hkeyClass;
+			public uint dwHotKey;
+			public IntPtr hIconMonitor;
+			public IntPtr hProcess;
+		}
+#endif
 	}
 }

Assets/Cryville/Crtr/BeatTime.cs

@@ -25,7 +25,7 @@ namespace Cryville.Crtr {
 		public int d;
 
 		[JsonIgnore]
-		public double Decimal { get { return b + (double)n / d; } }
+		public readonly double Decimal { get { return b + (double)n / d; } }
 
 		public int CompareTo(BeatTime other) {
 			var c = b.CompareTo(other.b);
@@ -34,15 +34,15 @@ namespace Cryville.Crtr {
 		}
 
 		public override bool Equals(object obj) {
-			if (!(obj is BeatTime)) return false;
+			if (obj is not BeatTime other) return false;
-			return Equals((BeatTime)obj);
+			return Equals(other);
 		}
 
 		public bool Equals(BeatTime other) {
 			return b.Equals(other.b) && ((double)n / d).Equals((double)other.n / other.d);
 		}
 
-		public override int GetHashCode() {
+		public override readonly int GetHashCode() {
 			return Decimal.GetHashCode();
 		}
 

Assets/Cryville/Crtr/Browsing/Actions/ActionManager.cs

@@ -4,54 +4,63 @@ using System.Linq;
 
 namespace Cryville.Crtr.Browsing.Actions {
 	public class ActionManager {
-		readonly Dictionary<Type, List<IResourceAction>> _actions = new Dictionary<Type, List<IResourceAction>>();
+		readonly Dictionary<Type, List<IResourceAction>> _actions = new();
+		readonly Dictionary<IResourceAction, int> _refCounts = new();
 
 		public event Action Changed;
 
 		class ActionPriorityComparer : IComparer<IResourceAction> {
-			public static readonly ActionPriorityComparer Instance = new ActionPriorityComparer();
+			public static readonly ActionPriorityComparer Instance = new();
 			public int Compare(IResourceAction x, IResourceAction y) {
 				return x.Priority.CompareTo(y.Priority);
 			}
 		}
 
 		void Register(Type type, IResourceAction action) {
-			List<IResourceAction> actions;
+			if (!_actions.TryGetValue(type, out List<IResourceAction> actions)) {
-			if (!_actions.TryGetValue(type, out actions)) {
 				_actions.Add(type, actions = new List<IResourceAction>());
 			}
 			int index = actions.BinarySearch(action, ActionPriorityComparer.Instance);
 			if (index < 0) index = ~index;
 			actions.Insert(index, action);
+			if (_refCounts.ContainsKey(action)) _refCounts[action]++;
+			else _refCounts[action] = 1;
 			Changed?.Invoke();
 		}
 		public void Register(IResourceAction action) {
 			Register(typeof(object), action);
 		}
-		public void Register<T>(IResourceAction<T> action) {
+		public void Register<T>(IResourceAction<T> action) where T : IResourceMeta {
 			Register(typeof(T), action);
 		}
 
 		public void Unregister(Type type, IResourceAction action) {
-			List<IResourceAction> actions;
+			if (!_actions.TryGetValue(type, out List<IResourceAction> actions)) return;
-			if (!_actions.TryGetValue(type, out actions)) return;
+			if (--_refCounts[action] > 0) return;
 			actions.Remove(action);
 			Changed?.Invoke();
 		}
 		public void Unregister(IResourceAction action) {
 			Unregister(typeof(object), action);
 		}
-		public void Unregister<T>(IResourceAction<T> action) {
+		public void Unregister<T>(IResourceAction<T> action) where T : IResourceMeta {
 			Unregister(typeof(T), action);
 		}
 
-		public IEnumerable<IResourceAction> GetActions(Type type) {
+		public IEnumerable<IResourceAction> GetActions(Uri uri, IResourceMeta res) {
-			List<IResourceAction> actions;
+			return GetActions(uri, res, res.GetType());
-			if (!_actions.TryGetValue(type, out actions)) {
+		}
-				actions = new List<IResourceAction>();
+		IEnumerable<IResourceAction> GetActions(Uri uri, IResourceMeta res, Type type) {
-			}
+			if (type == null) return Enumerable.Empty<IResourceAction>();
-			IEnumerable<IResourceAction> result = actions;
+			IEnumerable<IResourceAction> result;
-			if (type != typeof(object)) result = result.Concat(GetActions(type.BaseType));
+			if (_actions.TryGetValue(type, out List<IResourceAction> actions))
+				result = actions.Where(i => i.CanInvoke(uri, res));
+			else
+				result = Enumerable.Empty<IResourceAction>();
+			if (type != typeof(object))
+				result = result
+					.Concat(GetActions(uri, res, type.BaseType))
+					.Concat(type.GetInterfaces().SelectMany(i => GetActions(uri, res, i)));
 			return result;
 		}
 	}

Assets/Cryville/Crtr/Browsing/Actions/IResourceAction.cs

@@ -4,9 +4,12 @@ namespace Cryville.Crtr.Browsing.Actions {
 	public interface IResourceAction {
 		string Name { get; }
 		int Priority { get; }
-		void Invoke(Uri uri, object resource);
+
+		bool CanInvoke(Uri uri, IResourceMeta resource);
+		void Invoke(Uri uri, IResourceMeta resource);
 	}
-	public interface IResourceAction<T> : IResourceAction {
+	public interface IResourceAction<T> : IResourceAction where T : IResourceMeta {
+		bool CanInvoke(Uri uri, T resource);
 		void Invoke(Uri uri, T resource);
 	}
 }

Assets/Cryville/Crtr/Browsing/Actions/ImportResourceAction.cs

@@ -3,15 +3,18 @@ using System;
 
 namespace Cryville.Crtr.Browsing.Actions {
 	internal class ImportResourceAction : IResourceAction {
-		readonly IResourceManager _destination;
+		readonly IResourceDestination _destination;
-		public ImportResourceAction(IResourceManager destination) {
+		public ImportResourceAction(IResourceDestination destination) {
 			_destination = destination;
 		}
 
 		public string Name { get { return "Import"; } }
 		public int Priority { get { return 0; } }
 
-		public void Invoke(Uri uri, object resource) {
+		public bool CanInvoke(Uri uri, IResourceMeta resource) {
+			return _destination.CanImport(uri);
+		}
+		public void Invoke(Uri uri, IResourceMeta resource) {
 			if (_destination.ImportFrom(uri))
 				Popup.Create("Import succeeded");
 			else

Assets/Cryville/Crtr/Browsing/Actions/OpenConfigAction.cs

@@ -1,34 +1,43 @@
 using Cryville.Crtr.Browsing.UI;
-using Cryville.Crtr.UI;
+using Cryville.Crtr.Config;
 using System;
 using System.Collections.Generic;
 using Object = UnityEngine.Object;
 
 namespace Cryville.Crtr.Browsing.Actions {
-	internal class OpenConfigAction : ResourceAction<ChartDetail> {
+	internal class OpenConfigAction : ResourceAction<IChartDetail> {
 		public override string Name { get { return "Config"; } }
 
 		public override int Priority { get { return -50; } }
 
-		static Dictionary<string, int> _rulesetTabs = new Dictionary<string, int>();
+		static readonly Dictionary<string, int> _rulesetTabs = new();
 
-		public override void Invoke(Uri uri, ChartDetail resource) {
+		public override bool CanInvoke(Uri uri, IChartDetail resource) {
+			return true;
+		}
+		public override void Invoke(Uri uri, IChartDetail resource) {
+			Invoke(resource.RulesetId);
+		}
+
+		public static bool HasTab(string ruleset) {
 			var master = ResourceBrowserMaster.Instance;
-			var ruleset = resource.Meta.ruleset;
+			if (master == null) return false;
-			int tabId;
+			return _rulesetTabs.TryGetValue(ruleset, out int tabId) && master.HasTab(tabId);
-			if (_rulesetTabs.TryGetValue(ruleset, out tabId) && master.TryOpenTab(tabId))
+		}
+		public static void Invoke(string ruleset, Action<RulesetConfig> overrides = null) {
+			var master = ResourceBrowserMaster.Instance;
+			if (_rulesetTabs.TryGetValue(ruleset, out int tabId) && master.TryOpenTab(tabId))
 				return;
 			var browser = Object.Instantiate(master.m_configBrowserPrefab).GetComponent<RulesetConfigBrowser>();
 			try {
-				browser.Load(ruleset);
+				browser.Load(ruleset, overrides);
 			}
-			catch (Exception ex) {
+			catch (Exception) {
-				Dialog.Show(null, ex.Message);
-				Game.MainLogger.Log(4, "Config", "An error occurred while loading the config: {0}", ex);
 				Object.Destroy(browser.gameObject);
-				return;
+				throw;
 			}
-			_rulesetTabs[ruleset] = master.AddAndOpenTab(string.Format("Config: {0}", ruleset), browser);
+			_rulesetTabs[ruleset] = master.AddAndOpenTab(string.Format("{0} (Config)", ruleset), browser);
+			browser.InitAction();
 		}
 	}
 }

Assets/Cryville/Crtr/Browsing/Actions/PlayChartAction.cs

@@ -4,13 +4,16 @@ using System.IO;
 using UnityEngine.SceneManagement;
 
 namespace Cryville.Crtr.Browsing.Actions {
-	internal class PlayChartAction : ResourceAction<ChartDetail> {
+	internal class PlayChartAction : ResourceAction<IChartDetail> {
 		public override string Name { get { return "Play"; } }
 		public override int Priority { get { return -100; } }
 
-		public override void Invoke(Uri uri, ChartDetail resource) {
+		public override bool CanInvoke(Uri uri, IChartDetail resource) {
-			Settings.Default.LoadRuleset = Path.Combine(resource.Meta.ruleset, ".umgr");
+			return true;
-			Settings.Default.LoadRulesetConfig = resource.Meta.ruleset + ".json";
+		}
+		public override void Invoke(Uri uri, IChartDetail resource) {
+			Settings.Default.LoadRuleset = Path.Combine(resource.RulesetId, ".umgr");
+			Settings.Default.LoadRulesetConfig = resource.RulesetId + ".json";
 			Settings.Default.LoadChart = uri.LocalPath;
 #if UNITY_5_3_OR_NEWER
 			SceneManager.LoadScene("Play", LoadSceneMode.Additive);
@@ -19,7 +22,7 @@ namespace Cryville.Crtr.Browsing.Actions {
 #endif
 			Master.Instance.HideMenu();
 #if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN
-			DiscordController.Instance.SetPlaying(string.Format("{0} - {1}", resource.Meta.song.name, resource.Meta.name), resource.Meta.length);
+			DiscordController.Instance.SetPlaying(string.Format("{0} - {1}", resource.SongName, resource.Name), resource.Length.TotalSeconds);
 #endif
 		}
 	}

Assets/Cryville/Crtr/Browsing/Actions/ResourceAction.cs

@@ -1,14 +1,22 @@
 using System;
 
 namespace Cryville.Crtr.Browsing.Actions {
-	public abstract class ResourceAction<T> : IResourceAction<T> {
+	public abstract class ResourceAction<T> : IResourceAction<T> where T : IResourceMeta {
 		public abstract string Name { get; }
 		public abstract int Priority { get; }
-		public abstract void Invoke(Uri uri, T resource);
+
-		public void Invoke(Uri uri, object resource) {
+		public abstract bool CanInvoke(Uri uri, T resource);
+		public bool CanInvoke(Uri uri, IResourceMeta resource) {
 			if (resource == null) throw new ArgumentNullException("resource");
-			if (!(resource is T)) throw new ArgumentException("Mismatched resource type.");
+			if (resource is not T res) throw new ArgumentException("Mismatched resource type.");
-			Invoke(uri, (T)resource);
+			return CanInvoke(uri, res);
+		}
+
+		public abstract void Invoke(Uri uri, T resource);
+		public void Invoke(Uri uri, IResourceMeta resource) {
+			if (resource == null) throw new ArgumentNullException("resource");
+			if (resource is not T res) throw new ArgumentException("Mismatched resource type.");
+			Invoke(uri, res);
 		}
 	}
 }

Assets/Cryville/Crtr/Browsing/Actions/UseSkinAction.cs

@@ -0,0 +1,33 @@
+using Cryville.Crtr.Browsing.UI;
+using System;
+
+namespace Cryville.Crtr.Browsing.Actions {
+	internal class UseSkinAction : ResourceAction<ISkinDetail> {
+		readonly RulesetConfigBrowser _destination;
+		public UseSkinAction() : this(null) { }
+		public UseSkinAction(RulesetConfigBrowser destination) {
+			_destination = destination;
+		}
+
+		public override string Name { get { return "Use"; } }
+
+		public override int Priority { get { return -100; } }
+
+		public override bool CanInvoke(Uri uri, ISkinDetail resource) {
+			if (_destination == null) {
+				return !OpenConfigAction.HasTab(resource.RulesetId);
+			}
+			return _destination.RulesetName == resource.RulesetId;
+		}
+
+		public override void Invoke(Uri uri, ISkinDetail resource) {
+			if (_destination == null) {
+				OpenConfigAction.Invoke(resource.RulesetId, config => config.generic.Skin = resource.Name);
+			}
+			else {
+				_destination.SetSkin(resource.Name);
+				OpenConfigAction.Invoke(resource.RulesetId, null);
+			}
+		}
+	}
+}

Assets/Cryville/Crtr/Browsing/Actions/UseSkinAction.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c5c233e6228ce204fa1a9724c48ac8fe
+guid: ac898133ecfdb3f42bdade958381cd1a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Crtr/Browsing/ExtensionManager.cs

@@ -8,23 +8,25 @@ using System.Reflection;
 
 namespace Cryville.Crtr.Browsing {
 	internal static class ExtensionManager {
+		static bool _init;
 		static readonly Dictionary<string, List<ResourceConverter>> _converters
-			= new Dictionary<string, List<ResourceConverter>>();
+			= new();
 		public static ISet<string> GetSupportedFormats() {
 			return new HashSet<string>(_converters.Keys);
 		}
 		public static bool TryGetConverters(string extension, out IEnumerable<ResourceConverter> converters) {
-			List<ResourceConverter> outResult;
+			bool result = _converters.TryGetValue(extension, out List<ResourceConverter> outResult);
-			bool result = _converters.TryGetValue(extension, out outResult);
 			converters = outResult;
 			return result;
 		}
 		static readonly Dictionary<string, string> _localRes
-			= new Dictionary<string, string>();
+			= new();
 		public static IReadOnlyDictionary<string, string> GetLocalResourcePaths() {
 			return _localRes;
 		}
 		public static void Init(string rootPath) {
+			if (_init) return;
+			_init = true;
 			LoadExtension(typeof(Extensions.Extension));
 			var asms = AppDomain.CurrentDomain.GetAssemblies().Select(a => a.GetName().Name).ToHashSet();
 			var modules = new Queue<ModuleItem>();
@@ -59,8 +61,7 @@ namespace Cryville.Crtr.Browsing {
 						stream.Seek(0, SeekOrigin.Begin);
 						var buf = new byte[stream.Length];
 						stream.Read(buf, 0, buf.Length);
-						var asm = Assembly.Load(buf);
+						var asm = Assembly.Load(buf) ?? throw new TypeLoadException("Failed to load the module");
-						if (asm == null) throw new TypeLoadException("Failed to load the module");
 						asms.Add(asm.GetName().Name);
 						foreach (var type in asm.GetTypes()) {
 							if (typeof(ExtensionInterface).IsAssignableFrom(type)) {

Assets/Cryville/Crtr/Browsing/FileSystemResourceManager.cs

@@ -1,4 +1,5 @@
 using Cryville.Common;
+using Cryville.Crtr.Browsing.Actions;
 using Cryville.Crtr.UI;
 using System;
 using System.Collections.Generic;
@@ -16,7 +17,7 @@ namespace Cryville.Crtr.Browsing {
 		public FileSystemEntry this[int index] { get { return _filteredItems[index]; } }
 		IResourceMeta IResourceManager.this[int index] { get { return this[index]; } }
 
-		readonly List<string> _dirParts = new List<string>();
+		readonly List<string> _dirParts = new();
 		readonly IList<string> m_dirParts;
 		public IList<string> CurrentDirectory { get { return m_dirParts; } }
 		public int Count { get { return _filteredItems.Length; } }
@@ -118,7 +119,7 @@ namespace Cryville.Crtr.Browsing {
 			ItemChanged?.Invoke();
 		}
 
-		public bool ImportFrom(Uri uri) { throw new NotSupportedException(); }
+		public IResourceAction GetImportAction() { throw new NotSupportedException(); }
 		public void RemoveAt(int index) { throw new NotSupportedException(); }
 	}
 
@@ -135,8 +136,7 @@ namespace Cryville.Crtr.Browsing {
 		public IEnumerable<MetaProperty> Properties {
 			get {
 				yield return new MetaProperty("Name", _name);
-				if (FileSystemInfo is FileInfo) {
+				if (FileSystemInfo is FileInfo file) {
-					var file = (FileInfo)FileSystemInfo;
 					yield return new MetaProperty("Size", new Qualified<long>(file.Length, "B"));
 				}
 				yield return new MetaProperty("Write.Time", FileSystemInfo.LastWriteTime);

Assets/Cryville/Crtr/Browsing/IChartDetail.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Cryville.Crtr.Browsing {
+	internal interface IChartDetail : IResourceMeta {
+		string RulesetId { get; }
+		string Name { get; }
+		string SongName { get; }
+		TimeSpan Length { get; }
+	}
+}

Assets/Cryville/Crtr/Browsing/IChartDetail.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 71234dd1c93d47b4893750686b2333a3
+guid: 117e1aa46a380524096d0b6bea97c3d4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Crtr/Browsing/IResourceDestination.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Cryville.Crtr.Browsing {
+	public interface IResourceDestination {
+		bool CanImport(Uri uri);
+		bool ImportFrom(Uri uri);
+	}
+}

Assets/Cryville/Crtr/Browsing/IResourceDestination.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5a795e416e54c69418de1a3c27a88932
+guid: a81bd44e67e24a34782dfda1e6565fab
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Cryville/Crtr/Browsing/IResourceManager.cs

@@ -1,3 +1,4 @@
+using Cryville.Crtr.Browsing.Actions;
 using System;
 using System.Collections.Generic;
 
@@ -10,7 +11,7 @@ namespace Cryville.Crtr.Browsing {
 
 		event Action ItemChanged;
 		bool IsReadOnly { get; }
-		bool ImportFrom(Uri uri);
+		IResourceAction GetImportAction();
 		void RemoveAt(int index);
 
 		void Activate();

Assets/Cryville/Crtr/Browsing/ISkinDetail.cs

@@ -0,0 +1,6 @@
+namespace Cryville.Crtr.Browsing {
+	internal interface ISkinDetail : IResourceMeta {
+		string RulesetId { get; }
+		string Name { get; }
+	}
+}

Assets/Cryville/Crtr/Browsing/ISkinDetail.cs.meta

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