refactor: Update Unity to 2022.3.62

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) {
-				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/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) {
-			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

@@ -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 set2)) {
+				if (!map2.TryGetValue(f.FamilyName, out List<Typeface> 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>());
@@ -333,8 +333,7 @@ namespace Cryville.Common.Font {
 					yield return typeface1;
 				}
 				if (distinctFamily) continue;
-				IReadOnlyCollection<Typeface> typefaces2;
-				if (Manager.MapNameToTypefaces.TryGetValue(candidate, out typefaces2)) {
+				if (Manager.MapNameToTypefaces.TryGetValue(candidate, out IReadOnlyCollection<Typeface> 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) {
-			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;
@@ -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) {
-			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/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/Http11/Http11Client.cs

@@ -71,8 +71,7 @@ namespace Cryville.Common.Network.Http11 {
 			headers["Host"] = _baseUri.Host;
 			byte[] payload = null;
 			if (body != null) {
-				if (encoding == null)
-					encoding = Encoding.UTF8;
+				encoding ??= Encoding.UTF8;
 				payload = encoding.GetBytes(body);
 				headers.Add("Content-Encoding", encoding.EncodingName);
 				headers.Add("Content-Length", payload.Length.ToString(CultureInfo.InvariantCulture));

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

@@ -56,7 +56,7 @@ namespace Cryville.Common.Network.Http11 {
 		}
 
 		internal static string ReadLine(BinaryReader reader) {
-			StringBuilder result = new StringBuilder();
+			StringBuilder result = new();
 			char c;
 			while (true) {
 				c = reader.ReadChar();

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

@@ -72,8 +72,7 @@ namespace Cryville.Common.Network.Http11 {
 		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))
+			if (!int.TryParse(chunkHeader[0], NumberStyles.HexNumber, CultureInfo.InvariantCulture, out int chunkSize))
 				throw new IOException("Corrupted chunk received");
 			if (chunkSize == 0) {
 				_chunk = new byte[0];
@@ -106,7 +105,7 @@ namespace Cryville.Common.Network.Http11 {
 		}
 		public override byte[] ReadToEnd() {
 			if (_chunk.Length == 0) return new byte[0];
-			List<byte[]> segs = new List<byte[]>();
+			List<byte[]> segs = new();
 			while (true) {
 				if (_pos != 0) {
 					var buffer = new byte[_chunk.Length - _pos];

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) {
-					var t = (PdtInstruction.Collapse)i;
+				else if (i is PdtInstruction.Collapse t) {
 					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 cins)) cols.Remove(ip);
+			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);
@@ -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 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);

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 def)) {
+					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;

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)) {
-					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);
-				}
+				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) 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)) {
-						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);
-					}
+					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);
 			}
@@ -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) {
-			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() {
+		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 string ToString(string format) { return ToString(format, null); }
-		public string ToString(string format, IFormatProvider formatProvider) {
+		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) {

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) {
-				return obj is AttributeBinding && Equals((AttributeBinding)obj);
+			public override readonly bool Equals(object 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 Dictionary<AttributeBinding, object> _defaults = new Dictionary<AttributeBinding, object>();
-		readonly Dictionary<AttributeBinding, PropertyTweener<object>> _tweeners = new Dictionary<AttributeBinding, PropertyTweener<object>>();
-		readonly Dictionary<string, Dictionary<AttributeBinding, object>> _runtimeStates = new Dictionary<string, Dictionary<AttributeBinding, object>>();
+		readonly List<string> _statePriority = new();
+		readonly Dictionary<AttributeBinding, object> _defaults = new();
+		readonly Dictionary<AttributeBinding, PropertyTweener<object>> _tweeners = new();
+		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/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/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;
-			return Equals((BeatTime)obj);
+			if (obj is not BeatTime other) return false;
+			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,28 +4,27 @@ using System.Linq;
 
 namespace Cryville.Crtr.Browsing.Actions {
 	public class ActionManager {
-		readonly Dictionary<Type, List<IResourceAction>> _actions = new Dictionary<Type, List<IResourceAction>>();
-		readonly Dictionary<IResourceAction, int> _refCounts = new Dictionary<IResourceAction, int>();
+		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 actions)) {
+			if (!_actions.TryGetValue(type, out List<IResourceAction> 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] = 0;
+			else _refCounts[action] = 1;
 			Changed?.Invoke();
 		}
 		public void Register(IResourceAction action) {
@@ -36,8 +35,7 @@ namespace Cryville.Crtr.Browsing.Actions {
 		}
 
 		public void Unregister(Type type, IResourceAction action) {
-			List<IResourceAction> actions;
-			if (!_actions.TryGetValue(type, out actions)) return;
+			if (!_actions.TryGetValue(type, out List<IResourceAction> actions)) return;
 			if (--_refCounts[action] > 0) return;
 			actions.Remove(action);
 			Changed?.Invoke();
@@ -54,9 +52,8 @@ namespace Cryville.Crtr.Browsing.Actions {
 		}
 		IEnumerable<IResourceAction> GetActions(Uri uri, IResourceMeta res, Type type) {
 			if (type == null) return Enumerable.Empty<IResourceAction>();
-			List<IResourceAction> actions;
 			IEnumerable<IResourceAction> result;
-			if (_actions.TryGetValue(type, out actions))
+			if (_actions.TryGetValue(type, out List<IResourceAction> actions))
 				result = actions.Where(i => i.CanInvoke(uri, res));
 			else
 				result = Enumerable.Empty<IResourceAction>();

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

@@ -10,7 +10,7 @@ namespace Cryville.Crtr.Browsing.Actions {
 
 		public override int Priority { get { return -50; } }
 
-		static readonly Dictionary<string, int> _rulesetTabs = new Dictionary<string, int>();
+		static readonly Dictionary<string, int> _rulesetTabs = new();
 
 		public override bool CanInvoke(Uri uri, IChartDetail resource) {
 			return true;
@@ -20,15 +20,13 @@ namespace Cryville.Crtr.Browsing.Actions {
 		}
 
 		public static bool HasTab(string ruleset) {
-			int tabId;
 			var master = ResourceBrowserMaster.Instance;
 			if (master == null) return false;
-			return _rulesetTabs.TryGetValue(ruleset, out tabId) && master.HasTab(tabId);
+			return _rulesetTabs.TryGetValue(ruleset, out int tabId) && master.HasTab(tabId);
 		}
 		public static void Invoke(string ruleset, Action<RulesetConfig> overrides = null) {
 			var master = ResourceBrowserMaster.Instance;
-			int tabId;
-			if (_rulesetTabs.TryGetValue(ruleset, out tabId) && master.TryOpenTab(tabId))
+			if (_rulesetTabs.TryGetValue(ruleset, out int tabId) && master.TryOpenTab(tabId))
 				return;
 			var browser = Object.Instantiate(master.m_configBrowserPrefab).GetComponent<RulesetConfigBrowser>();
 			try {

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

@@ -8,15 +8,15 @@ namespace Cryville.Crtr.Browsing.Actions {
 		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.");
-			return CanInvoke(uri, (T)resource);
+			if (resource is not T res) throw new ArgumentException("Mismatched resource type.");
+			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 T)) throw new ArgumentException("Mismatched resource type.");
-			Invoke(uri, (T)resource);
+			if (resource is not T res) throw new ArgumentException("Mismatched resource type.");
+			Invoke(uri, res);
 		}
 	}
 }

Assets/Cryville/Crtr/Browsing/ExtensionManager.cs

@@ -10,18 +10,17 @@ 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 outResult);
+			bool result = _converters.TryGetValue(extension, out List<ResourceConverter> outResult);
 			converters = outResult;
 			return result;
 		}
 		static readonly Dictionary<string, string> _localRes
-			= new Dictionary<string, string>();
+			= new();
 		public static IReadOnlyDictionary<string, string> GetLocalResourcePaths() {
 			return _localRes;
 		}
@@ -62,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);
-						if (asm == null) throw new TypeLoadException("Failed to load the module");
+						var asm = Assembly.Load(buf) ?? 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

@@ -17,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; } }
@@ -136,8 +136,7 @@ namespace Cryville.Crtr.Browsing {
 		public IEnumerable<MetaProperty> Properties {
 			get {
 				yield return new MetaProperty("Name", _name);
-				if (FileSystemInfo is FileInfo) {
-					var file = (FileInfo)FileSystemInfo;
+				if (FileSystemInfo is FileInfo file) {
 					yield return new MetaProperty("Size", new Qualified<long>(file.Length, "B"));
 				}
 				yield return new MetaProperty("Write.Time", FileSystemInfo.LastWriteTime);

Assets/Cryville/Crtr/Browsing/Legacy/LegacyResourceManager.cs

@@ -10,11 +10,11 @@ namespace Cryville.Crtr.Browsing.Legacy {
 	internal abstract class LegacyResourceManager<T> : IPathedResourceManager<T> where T : IResourceMeta {
 		protected readonly LegacyResourceStore _store;
 		DirectoryInfo _cd;
-		readonly FileSystemWatcher _watcher = new FileSystemWatcher();
+		readonly FileSystemWatcher _watcher = new();
 		DirectoryInfo[] _items = new DirectoryInfo[0];
 		DirectoryInfo[] _filteredItems = new DirectoryInfo[0];
 		string _filter = string.Empty;
-		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; } }

Assets/Cryville/Crtr/Browsing/Legacy/LegacyResourceStore.cs

@@ -34,8 +34,7 @@ namespace Cryville.Crtr.Browsing.Legacy {
 		}
 		public bool ImportFrom(Uri uri) {
 			var file = new FileInfo(uri.LocalPath);
-			IEnumerable<ResourceConverter> converters;
-			if (!ExtensionManager.TryGetConverters(file.Extension, out converters)) return false;
+			if (!ExtensionManager.TryGetConverters(file.Extension, out IEnumerable<ResourceConverter> converters)) return false;
 			foreach (var converter in converters) {
 				var resources = new List<Resource>();
 				var ses = new ConversionSession {
@@ -69,8 +68,7 @@ namespace Cryville.Crtr.Browsing.Legacy {
 								coverFile.CopyTo(Path.Combine(dir.FullName, tres.Meta.cover), true);
 						}
 					}
-					else if (res is FileResource) {
-						var tres = (FileResource)res;
+					else if (res is FileResource tres) {
 						DirectoryInfo dest;
 						bool singleFileFlag = false;
 						if (res is ChartResource)

Assets/Cryville/Crtr/Browsing/UI/BrowserItemTile.cs

@@ -31,7 +31,7 @@ namespace Cryville.Crtr.Browsing.UI {
 			OnReset();
 		}
 		protected override void OnReset() {
-			if (_cover != null) _cover.Cancel();
+			_cover?.Cancel();
 			if (m_icon.sprite != null && m_icon.sprite != m_iconPlaceholder) {
 				Destroy(m_icon.sprite.texture);
 				Destroy(m_icon.sprite);

Assets/Cryville/Crtr/Browsing/UI/BrowserTabLayout.cs

@@ -79,8 +79,7 @@ namespace Cryville.Crtr.Browsing.UI {
 		protected override void OnEnable() {
 			base.OnEnable();
 			m_layoutMinWidth = GetTargetLayoutMinWidth();
-			if (_tweener == null)
-				_tweener = new PropertyTweener<float>(
+			_tweener ??= new PropertyTweener<float>(
 					() => m_layoutMinWidth,
 					v => UpdateLayoutMinWidth(v),
 					Tweeners.Float.With(EasingFunctions.OutQuad)

Assets/Cryville/Crtr/Browsing/UI/DetailPanel.cs

@@ -72,7 +72,7 @@ namespace Cryville.Crtr.Browsing.UI {
 		}
 
 		void DestroyDynamicResources() {
-			if (_image != null) _image.Cancel();
+			_image?.Cancel();
 			if (m_cover.sprite != null && m_cover.sprite != m_coverPlaceholder) {
 				Destroy(m_cover.sprite.texture);
 				Destroy(m_cover.sprite);

Assets/Cryville/Crtr/Browsing/UI/PathedResourceBrowser.cs

@@ -34,8 +34,8 @@ namespace Cryville.Crtr.Browsing.UI {
 		IResourceAction _importAction;
 		readonly IResourceAction[] _importActionArray = new IResourceAction[1];
 
-		readonly HashSet<int> _selectedItems = new HashSet<int>();
-		readonly Dictionary<int, BrowserItem> _items = new Dictionary<int, BrowserItem>();
+		readonly HashSet<int> _selectedItems = new();
+		readonly Dictionary<int, BrowserItem> _items = new();
 
 		bool _destroyed;
 		protected virtual void Start() {
@@ -52,10 +52,10 @@ namespace Cryville.Crtr.Browsing.UI {
 		}
 
 		void OnEnable() {
-			if (_manager != null) _manager.Activate();
+			_manager?.Activate();
 		}
 		void OnDisable() {
-			if (_manager != null) _manager.Deactivate();
+			_manager?.Deactivate();
 		}
 
 		public void Init(IPathedResourceManager<IResourceMeta> manager) {

Assets/Cryville/Crtr/Browsing/UI/ResourceBrowserMaster.cs

@@ -21,8 +21,8 @@ namespace Cryville.Crtr.Browsing.UI {
 		internal GameObject m_configBrowserPrefab;
 
 		BrowserTab _currentTab;
-		readonly Dictionary<int, BrowserTab> _tabMap = new Dictionary<int, BrowserTab>();
-		readonly Dictionary<BrowserTab, ResourceBrowser> _tabs = new Dictionary<BrowserTab, ResourceBrowser>();
+		readonly Dictionary<int, BrowserTab> _tabMap = new();
+		readonly Dictionary<BrowserTab, ResourceBrowser> _tabs = new();
 
 		public ActionManager Actions { get; private set; }
 
@@ -77,8 +77,7 @@ namespace Cryville.Crtr.Browsing.UI {
 			return _tabMap.ContainsKey(id);
 		}
 		public bool TryOpenTab(int id) {
-			BrowserTab tab;
-			if (_tabMap.TryGetValue(id, out tab)) {
+			if (_tabMap.TryGetValue(id, out BrowserTab tab)) {
 				OnTabClicked(tab);
 				return true;
 			}

Assets/Cryville/Crtr/Browsing/UI/RulesetConfigBrowser.cs

@@ -31,21 +31,21 @@ namespace Cryville.Crtr.Browsing.UI {
 
 		public void Load(string rulesetName, Action<RulesetConfig> overrides = null) {
 			RulesetName = rulesetName;
-			FileInfo file = new FileInfo(Path.Combine(
+			FileInfo file = new(Path.Combine(
 				Game.GameDataPath, "rulesets", rulesetName, ".umgr"
 			));
 			if (!file.Exists) {
 				throw new FileNotFoundException("Ruleset for the resource not found\nMake sure you have imported the ruleset");
 			}
 			DirectoryInfo dir = file.Directory;
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+			using (StreamReader reader = new(file.FullName, Encoding.UTF8)) {
 				_ruleset = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
 					MissingMemberHandling = MissingMemberHandling.Error
 				});
 				if (_ruleset.format != RulesetDefinition.CURRENT_FORMAT) throw new FormatException("Invalid ruleset file version");
 				_ruleset.LoadPdt(dir);
 			}
-			FileInfo cfgfile = new FileInfo(Path.Combine(
+			FileInfo cfgfile = new(Path.Combine(
 				Game.GameDataPath, "config", "rulesets", rulesetName + ".json"
 			));
 			if (!cfgfile.Exists) {
@@ -53,11 +53,10 @@ namespace Cryville.Crtr.Browsing.UI {
 				_rscfg = new RulesetConfig();
 			}
 			else {
-				using (StreamReader cfgreader = new StreamReader(cfgfile.FullName, Encoding.UTF8)) {
-					_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
-						MissingMemberHandling = MissingMemberHandling.Error
-					});
-				}
+				using StreamReader cfgreader = new(cfgfile.FullName, Encoding.UTF8);
+				_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
+					MissingMemberHandling = MissingMemberHandling.Error
+				});
 			}
 
 			overrides?.Invoke(_rscfg);
@@ -92,12 +91,11 @@ namespace Cryville.Crtr.Browsing.UI {
 		void OnDisable() {
 			if (_loaded) {
 				m_inputConfigPanel.SaveTo(_rscfg.inputs);
-				FileInfo cfgFile = new FileInfo(Path.Combine(
+				FileInfo cfgFile = new(Path.Combine(
 					Game.GameDataPath, "config", "rulesets", RulesetName + ".json"
 				));
-				using (StreamWriter cfgWriter = new StreamWriter(cfgFile.FullName, false, Encoding.UTF8)) {
-					cfgWriter.Write(JsonConvert.SerializeObject(_rscfg, Game.GlobalJsonSerializerSettings));
-				}
+				using StreamWriter cfgWriter = new(cfgFile.FullName, false, Encoding.UTF8);
+				cfgWriter.Write(JsonConvert.SerializeObject(_rscfg, Game.GlobalJsonSerializerSettings));
 			}
 		}
 

Assets/Cryville/Crtr/BuiltinResources.cs

@@ -6,13 +6,13 @@ using UnityEngine;
 namespace Cryville.Crtr {
 	public static class BuiltinResources {
 		public static Dictionary<string, Type> Components
-			= new Dictionary<string, Type>();
+			= new();
 		public static Dictionary<string, Shader> Shaders
-			= new Dictionary<string, Shader>();
+			= new();
 		public static Dictionary<string, Mesh> Meshes
-			= new Dictionary<string, Mesh>();
+			= new();
 		public static Dictionary<string, Material> Materials
-			= new Dictionary<string, Material>();
+			= new();
 
 		static bool loaded;
 

Assets/Cryville/Crtr/Chart.cs

@@ -66,8 +66,7 @@ namespace Cryville.Crtr {
 		[JsonIgnore]
 		public ReleaseEvent ReleaseEvent {
 			get {
-				if (relev == null) relev = new ReleaseEvent(this);
-				return relev;
+				return relev ??= new ReleaseEvent(this);
 			}
 		}
 
@@ -112,7 +111,7 @@ namespace Cryville.Crtr {
 		}
 	}
 	public abstract class EventContainer : ChartEvent {
-		public List<Chart.Motion> motions = new List<Chart.Motion>();
+		public List<Chart.Motion> motions = new();
 
 		[JsonIgnore]
 		public Clip Clip { get; private set; }
@@ -128,12 +127,10 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		public virtual EventList GetEventsOfType(string type) {
-			switch (type) {
-				case "motions": return new EventList<Chart.Motion>(motions);
-				default: throw new ArgumentException(string.Format("Unknown event type \"{0}\"", type));
-			}
-		}
+		public virtual EventList GetEventsOfType(string type) => type switch {
+			"motions" => new EventList<Chart.Motion>(motions),
+			_ => throw new ArgumentException(string.Format("Unknown event type \"{0}\"", type)),
+		};
 	}
 	public abstract class EventList : ChartEvent {
 		public IList<ChartEvent> Events { get; private set; }
@@ -178,7 +175,7 @@ namespace Cryville.Crtr {
 
 		public string ruleset;
 
-		public List<Group> groups = new List<Group>();
+		public List<Group> groups = new();
 
 		public override IEnumerable<ChartEvent> Events {
 			get {
@@ -189,18 +186,16 @@ namespace Cryville.Crtr {
 			}
 		}
 
-		public override EventList GetEventsOfType(string type) {
-			switch (type) {
-				case "groups": return new EventList<Group>(groups);
-				default: return base.GetEventsOfType(type);
-			}
-		}
+		public override EventList GetEventsOfType(string type) => type switch {
+			"groups" => new EventList<Group>(groups),
+			_ => base.GetEventsOfType(type),
+		};
 
 		public override int Priority { get { return 10; } }
 
 		public class Group : EventContainer {
-			public List<Track> tracks = new List<Track>();
-			public List<Note> notes = new List<Note>();
+			public List<Track> tracks = new();
+			public List<Note> notes = new();
 			public override IEnumerable<ChartEvent> Events {
 				get {
 					return base.Events
@@ -209,13 +204,11 @@ namespace Cryville.Crtr {
 					));
 				}
 			}
-			public override EventList GetEventsOfType(string type) {
-				switch (type) {
-					case "tracks": return new EventList<Track>(tracks);
-					case "notes": return new EventList<Note>(notes);
-					default: return base.GetEventsOfType(type);
-				}
-			}
+			public override EventList GetEventsOfType(string type) => type switch {
+				"tracks" => new EventList<Track>(tracks),
+				"notes" => new EventList<Note>(notes),
+				_ => base.GetEventsOfType(type),
+			};
 			public override int Priority { get { return 12; } }
 		}
 
@@ -228,8 +221,8 @@ namespace Cryville.Crtr {
 			string m_motion;
 			[JsonRequired]
 			public string motion {
-				get { return m_motion == null ? ToString() : m_motion; }
-				set { LoadFromString(value); }
+				get => m_motion ?? ToString();
+				set => LoadFromString(value);
 			}
 #pragma warning restore IDE1006
 			private void LoadFromString(string s) {
@@ -264,12 +257,11 @@ namespace Cryville.Crtr {
 			[JsonIgnore]
 			public Identifier Name {
 				get {
-					if (name == default(Identifier)) throw new InvalidOperationException("Motion name not set");
+					if (name == default) throw new InvalidOperationException("Motion name not set");
 					return name;
 				}
 				private set {
-					MotionRegistry reg;
-					if (!ChartPlayer.motionRegistry.TryGetValue(value, out reg))
+					if (!ChartPlayer.motionRegistry.TryGetValue(value, out MotionRegistry reg))
 						throw new ArgumentException("Invalid motion name");
 					Node = new MotionNode { Value = reg.InitValue };
 					name = value;
@@ -293,7 +285,7 @@ namespace Cryville.Crtr {
 				SubmitPropOp("name", new PropOp.Identifier(v => {
 					var n = new Identifier(v);
 					if (name == n) { }
-					else if (name == default(Identifier)) Name = n;
+					else if (name == default) Name = n;
 					else throw new RulesetViolationException(string.Format(
 						"Motion name not matched, expected {0}, got {1}", n, Name
 					));
@@ -306,7 +298,7 @@ namespace Cryville.Crtr {
 		}
 
 		public class Note : EventContainer {
-			public List<Judge> judges = new List<Judge>();
+			public List<Judge> judges = new();
 			public override IEnumerable<ChartEvent> Events {
 				get {
 					return base.Events
@@ -315,12 +307,10 @@ namespace Cryville.Crtr {
 				}
 			}
 
-			public override EventList GetEventsOfType(string type) {
-				switch (type) {
-					case "judges": return new EventList<Judge>(judges);
-					default: return base.GetEventsOfType(type);
-				}
-			}
+			public override EventList GetEventsOfType(string type) => type switch {
+				"judges" => new EventList<Judge>(judges),
+				_ => base.GetEventsOfType(type),
+			};
 			public override int Priority { get { return 20; } }
 		}
 
@@ -345,7 +335,7 @@ namespace Cryville.Crtr {
 
 		// TODO [Obsolete]
 		public List<Signature> sigs; // Signatures
-		// TODO [Obsolete]
+									 // TODO [Obsolete]
 		public class Signature : ChartEvent {
 			public float? tempo;
 

Assets/Cryville/Crtr/ChartCompatibilityHandler.cs

@@ -11,11 +11,11 @@ namespace Cryville.Crtr {
 		public static IMotionStringParser MotionStringParser { get; private set; }
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) {
 			var obj = JToken.ReadFrom(reader);
-			switch (obj["format"].ToObject<int>()) {
-				case 2: MotionStringParser = MotionStringParser2.Instance; break;
-				case 3: MotionStringParser = MotionStringParser3.Instance; break;
-				default: throw new FormatException("Unsupported chart format");
-			}
+			MotionStringParser = obj["format"].ToObject<int>() switch {
+				2 => MotionStringParser2.Instance,
+				3 => MotionStringParser3.Instance,
+				_ => throw new FormatException("Unsupported chart format"),
+			};
 			return base.ReadJson(obj.CreateReader(), objectType, existingValue, serializer);
 		}
 		public override Chart Create(Type objectType) {
@@ -28,12 +28,11 @@ namespace Cryville.Crtr {
 			static MotionStringParser2 _instance;
 			public static MotionStringParser2 Instance {
 				get {
-					if (_instance == null)
-						_instance = new MotionStringParser2();
+					_instance ??= new MotionStringParser2();
 					return _instance;
 				}
 			}
-			static readonly PdtFragmentInterpreter _itor = new PdtFragmentInterpreter();
+			static readonly PdtFragmentInterpreter _itor = new();
 			static readonly PropOp _vecop = new VectorOp(v => _vecbuf = v);
 			static float[] _vecbuf;
 			public void Parse(string str, out Identifier name, out MotionNode node) {
@@ -74,12 +73,11 @@ namespace Cryville.Crtr {
 			static MotionStringParser3 _instance;
 			public static MotionStringParser3 Instance {
 				get {
-					if (_instance == null)
-						_instance = new MotionStringParser3();
+					_instance ??= new MotionStringParser3();
 					return _instance;
 				}
 			}
-			static readonly PdtFragmentInterpreter _itor = new PdtFragmentInterpreter();
+			static readonly PdtFragmentInterpreter _itor = new();
 			static readonly PropOp _vecop = new VectorOp(v => _vecbuf = v);
 			static float[] _vecbuf;
 			public void Parse(string str, out Identifier name, out MotionNode node) {

Assets/Cryville/Crtr/ChartPlayer.cs

@@ -97,12 +97,12 @@ namespace Cryville.Crtr {
 		}
 
 		void OnDestroy() {
-			if (cbus != null) cbus.Dispose();
-			if (bbus != null) bbus.Dispose();
-			if (tbus != null) tbus.Dispose();
-			if (nbus != null) nbus.Dispose();
-			if (loadThread != null) loadThread.Abort();
-			if (inputProxy != null) inputProxy.Dispose();
+			cbus?.Dispose();
+			bbus?.Dispose();
+			tbus?.Dispose();
+			nbus?.Dispose();
+			loadThread?.Abort();
+			inputProxy?.Dispose();
 			if (texs != null) foreach (var t in texs) Texture.Destroy(t.Value);
 			Game.MainLogger.RemoveListener(loggerListener);
 			loggerListener.Dispose();
@@ -200,24 +200,22 @@ namespace Cryville.Crtr {
 				}
 			}
 		}
-		readonly TargetString statusstr = new TargetString();
-		readonly StringBuffer statusbuf = new StringBuffer();
-		readonly TargetString logsstr = new TargetString();
-		readonly StringBuffer logsbuf = new StringBuffer();
-		readonly List<string> logEntries = new List<string>();
+		readonly StringBuffer statusbuf = new();
+		readonly StringBuffer logsbuf = new();
+		readonly List<string> logEntries = new();
+		readonly ArrayPool<char> logBufferPool = new();
 		int logsLength = 0;
 		LogHandler d_addLogEntry;
 		void AddLogEntry(int level, string module, string msg) {
-			string color;
-			switch (level) {
-				case 0: color = "#888888"; break;
-				case 1: color = "#bbbbbb"; break;
-				case 2: color = "#0088ff"; break;
-				case 3: color = "#ffff00"; break;
-				case 4: color = "#ff0000"; break;
-				case 5: color = "#bb0000"; break;
-				default: color = "#ff00ff"; break;
-			}
+			string color = level switch {
+				0 => "#888888",
+				1 => "#bbbbbb",
+				2 => "#0088ff",
+				3 => "#ffff00",
+				4 => "#ff0000",
+				5 => "#bb0000",
+				_ => "#ff00ff",
+			};
 			var l = string.Format(
 				"\n<color={1}bb><{2}> {3}</color>",
 				DateTime.UtcNow.ToString("s"), color, module, msg
@@ -235,10 +233,10 @@ namespace Cryville.Crtr {
 			foreach (var l in logEntries) {
 				logsbuf.Append(l);
 			}
-			logsstr.Length = logsbuf.Count;
-			var larr = logsstr.TrustedAsArray();
-			logsbuf.CopyTo(0, larr, 0, logsbuf.Count);
-			logs.SetText(larr, 0, logsbuf.Count);
+			var lbuf = logBufferPool.Rent(logsbuf.Count);
+			logsbuf.CopyTo(0, lbuf, 0, logsbuf.Count);
+			logs.SetText(lbuf, 0, logsbuf.Count);
+			logBufferPool.Return(lbuf);
 
 			statusbuf.Clear();
 			statusbuf.AppendFormat(
@@ -286,14 +284,15 @@ namespace Cryville.Crtr {
 				);
 				if (judge != null) {
 					statusbuf.Append("\n== Scores ==\n");
-					var fullScoreStr = judge.GetFullFormattedScoreString();
-					statusbuf.Append(fullScoreStr.TrustedAsArray(), 0, fullScoreStr.Length);
+					var fullScoreStrLen = judge.GetFullFormattedScoreString(logBufferPool, out char[] fullScoreStr);
+					statusbuf.Append(fullScoreStr, 0, fullScoreStrLen);
+					logBufferPool.Return(fullScoreStr);
 				}
 			}
-			statusstr.Length = statusbuf.Count;
-			var sarr = statusstr.TrustedAsArray();
-			statusbuf.CopyTo(0, sarr, 0, statusbuf.Count);
-			status.SetText(sarr, 0, statusbuf.Count);
+			var buf = logBufferPool.Rent(statusbuf.Count);
+			statusbuf.CopyTo(0, buf, 0, statusbuf.Count);
+			status.SetText(buf, 0, statusbuf.Count);
+			logBufferPool.Return(buf);
 		}
 		#endregion
 
@@ -386,8 +385,7 @@ namespace Cryville.Crtr {
 
 			var hitPlane = new Plane(Vector3.forward, Vector3.zero);
 			var r0 = Camera.main.ViewportPointToRay(new Vector3(0, 0, 1));
-			float dist;
-			hitPlane.Raycast(r0, out dist);
+			hitPlane.Raycast(r0, out float dist);
 			var p0 = r0.GetPoint(dist);
 			var r1 = Camera.main.ViewportPointToRay(new Vector3(1, 1, 1));
 			hitPlane.Raycast(r1, out dist);
@@ -397,18 +395,18 @@ namespace Cryville.Crtr {
 			screenSize = new Vector2(Screen.width, Screen.height);
 			frustumPlanes = GeometryUtility.CalculateFrustumPlanes(Camera.main);
 
-			FileInfo chartFile = new FileInfo(Settings.Default.LoadChart);
+			FileInfo chartFile = new(Settings.Default.LoadChart);
 
-			FileInfo rulesetFile = new FileInfo(Path.Combine(
+			FileInfo rulesetFile = new(Path.Combine(
 				Game.GameDataPath, "rulesets", Settings.Default.LoadRuleset
 			));
 			if (!rulesetFile.Exists) throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset");
 
-			FileInfo rulesetConfigFile = new FileInfo(Path.Combine(
+			FileInfo rulesetConfigFile = new(Path.Combine(
 				Game.GameDataPath, "config", "rulesets", Settings.Default.LoadRulesetConfig
 			));
 			if (!rulesetConfigFile.Exists) throw new FileNotFoundException("Ruleset config not found\nPlease open the config to generate");
-			using (StreamReader cfgreader = new StreamReader(rulesetConfigFile.FullName, Encoding.UTF8)) {
+			using (StreamReader cfgreader = new(rulesetConfigFile.FullName, Encoding.UTF8)) {
 				_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
 					MissingMemberHandling = MissingMemberHandling.Error
 				});
@@ -416,11 +414,11 @@ namespace Cryville.Crtr {
 			sv = _rscfg.generic.ScrollVelocity;
 			soundOffset += _rscfg.generic.SoundOffset;
 
-			FileInfo skinFile = new FileInfo(Path.Combine(
+			FileInfo skinFile = new(Path.Combine(
 				Game.GameDataPath, "skins", rulesetFile.Directory.Name, _rscfg.generic.Skin, ".umgs"
 			));
 			if (!skinFile.Exists) throw new FileNotFoundException("Skin not found\nPlease specify an available skin in the config");
-			using (StreamReader reader = new StreamReader(skinFile.FullName, Encoding.UTF8)) {
+			using (StreamReader reader = new(skinFile.FullName, Encoding.UTF8)) {
 				skin = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
 					MissingMemberHandling = MissingMemberHandling.Error
 				});
@@ -446,7 +444,7 @@ namespace Cryville.Crtr {
 		}
 
 		IEnumerator<float> LoadTextures(List<string> queue) {
-			Stopwatch stopwatch = new Stopwatch();
+			Stopwatch stopwatch = new();
 			stopwatch.Start();
 #if UNITY_5_4_OR_NEWER
 			DownloadHandlerTexture texHandler = null;
@@ -499,7 +497,7 @@ namespace Cryville.Crtr {
 		}
 
 		IEnumerator<float> Prehandle() {
-			Stopwatch timer = new Stopwatch();
+			Stopwatch timer = new();
 			timer.Reset(); timer.Start();
 			Game.MainLogger.Log(0, "Load/Prehandle", "Prehandling (iteration 2)"); yield return 0;
 			cbus.BroadcastPreInit();
@@ -618,73 +616,72 @@ namespace Cryville.Crtr {
 				{ new Identifier("track")  , new MotionRegistry(typeof(Vec1)) },
 			};
 
-			using (StreamReader reader = new StreamReader(info.chartFile.FullName, Encoding.UTF8)) {
-				PdtEvaluator.Instance.Reset();
+			using StreamReader reader = new(info.chartFile.FullName, Encoding.UTF8);
+			PdtEvaluator.Instance.Reset();
 
-				LoadRuleset(info.rulesetFile); loadPregress = .05f;
+			LoadRuleset(info.rulesetFile); loadPregress = .05f;
 
-				chart = JsonConvert.DeserializeObject<Chart>(reader.ReadToEnd(), new JsonSerializerSettings() {
-					MissingMemberHandling = MissingMemberHandling.Error
-				});
+			chart = JsonConvert.DeserializeObject<Chart>(reader.ReadToEnd(), new JsonSerializerSettings() {
+				MissingMemberHandling = MissingMemberHandling.Error
+			});
 
-				Game.MainLogger.Log(0, "Load/WorkerThread", "Applying ruleset (iteration 1)"); loadPregress = .10f;
-				pruleset.PrePatch(chart);
+			Game.MainLogger.Log(0, "Load/WorkerThread", "Applying ruleset (iteration 1)"); loadPregress = .10f;
+			pruleset.PrePatch(chart);
 
-				Game.MainLogger.Log(0, "Load/WorkerThread", "Batching events"); loadPregress = .20f;
-				var batcher = new EventBatcher(chart);
-				batcher.Forward();
-				cbus = batcher.Batch(); loadPregress = .30f;
+			Game.MainLogger.Log(0, "Load/WorkerThread", "Batching events"); loadPregress = .20f;
+			var batcher = new EventBatcher(chart);
+			batcher.Forward();
+			cbus = batcher.Batch(); loadPregress = .30f;
 
-				LoadSkin(info.skinFile);
+			LoadSkin(info.skinFile);
 
-				Game.MainLogger.Log(0, "Load/WorkerThread", "Initializing judge and input"); loadPregress = .35f;
-				judge = new Judge(this, pruleset);
-				PdtEvaluator.Instance.ContextJudge = judge;
+			Game.MainLogger.Log(0, "Load/WorkerThread", "Initializing judge and input"); loadPregress = .35f;
+			judge = new Judge(this, pruleset);
+			PdtEvaluator.Instance.ContextJudge = judge;
 
-				inputProxy = new InputProxy(pruleset, judge, screenSize);
-				inputProxy.LoadFrom(_rscfg.inputs);
-				if (!inputProxy.IsCompleted()) {
-					Game.MainLogger.Log(2, "Game", "Input config not completed. Input disabled");
-					inputProxy.Clear();
-				}
-
-				Game.MainLogger.Log(0, "Load/WorkerThread", "Attaching handlers"); loadPregress = .40f;
-				var ch = new ChartHandler(chart);
-				cbus.RootState.AttachHandler(ch);
-				foreach (var gs in cbus.RootState.Children) {
-					var gh = new GroupHandler((Chart.Group)gs.Key, ch);
-					gs.Value.AttachHandler(gh);
-					foreach (var ts in gs.Value.Children) {
-						ContainerHandler th;
-						if (ts.Key is Chart.Note) {
-							th = new NoteHandler((Chart.Note)ts.Key, gh);
-						}
-						else {
-							th = new TrackHandler((Chart.Track)ts.Key, gh);
-						}
-						ts.Value.AttachHandler(th);
-					}
-				}
-				cbus.AttachSystems(pskin, judge);
-				Game.MainLogger.Log(0, "Load/WorkerThread", "Prehandling (iteration 1)"); loadPregress = .60f;
-				using (var pbus = cbus.Clone(16)) {
-					pbus.Forward();
-				}
-
-				Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 1)"); loadPregress = .70f;
-				bbus = cbus.Clone(1, -clippingDist);
-				Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 2)"); loadPregress = .80f;
-				tbus = bbus.Clone(2);
-				Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 3)"); loadPregress = .90f;
-				nbus = bbus.Clone(3);
-				loadPregress = 1;
+			inputProxy = new InputProxy(pruleset, judge, screenSize);
+			inputProxy.LoadFrom(_rscfg.inputs);
+			if (!inputProxy.IsCompleted()) {
+				Game.MainLogger.Log(2, "Game", "Input config not completed. Input disabled");
+				inputProxy.Clear();
 			}
+
+			Game.MainLogger.Log(0, "Load/WorkerThread", "Attaching handlers"); loadPregress = .40f;
+			var ch = new ChartHandler(chart);
+			cbus.RootState.AttachHandler(ch);
+			foreach (var gs in cbus.RootState.Children) {
+				var gh = new GroupHandler((Chart.Group)gs.Key, ch);
+				gs.Value.AttachHandler(gh);
+				foreach (var ts in gs.Value.Children) {
+					ContainerHandler th;
+					if (ts.Key is Chart.Note) {
+						th = new NoteHandler((Chart.Note)ts.Key, gh);
+					}
+					else {
+						th = new TrackHandler((Chart.Track)ts.Key, gh);
+					}
+					ts.Value.AttachHandler(th);
+				}
+			}
+			cbus.AttachSystems(pskin, judge);
+			Game.MainLogger.Log(0, "Load/WorkerThread", "Prehandling (iteration 1)"); loadPregress = .60f;
+			using (var pbus = cbus.Clone(16)) {
+				pbus.Forward();
+			}
+
+			Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 1)"); loadPregress = .70f;
+			bbus = cbus.Clone(1, -clippingDist);
+			Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 2)"); loadPregress = .80f;
+			tbus = bbus.Clone(2);
+			Game.MainLogger.Log(0, "Load/WorkerThread", "Cloning states (type 3)"); loadPregress = .90f;
+			nbus = bbus.Clone(3);
+			loadPregress = 1;
 		}
 
 		void LoadRuleset(FileInfo file) {
 			DirectoryInfo dir = file.Directory;
 			Game.MainLogger.Log(0, "Load/WorkerThread", "Loading ruleset: {0}", file);
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
+			using (StreamReader reader = new(file.FullName, Encoding.UTF8)) {
 				ruleset = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {
 					MissingMemberHandling = MissingMemberHandling.Error
 				});

Assets/Cryville/Crtr/Config/IPropertyMasterAdapter.cs

@@ -12,8 +12,7 @@ namespace Cryville.Crtr.Config {
 		readonly object _target;
 
 		public DefaultPropertyMasterAdapter(object target) {
-			if (target == null) throw new ArgumentNullException("target");
-			_target = target;
+			_target = target ?? throw new ArgumentNullException("target");
 		}
 
 		public string DefaultCategory { get { return "miscellaneous"; } }

Assets/Cryville/Crtr/Config/RulesetConfig.cs

@@ -6,7 +6,7 @@ using System.ComponentModel;
 
 namespace Cryville.Crtr.Config {
 	public class RulesetConfig {
-		public Generic generic = new Generic();
+		public Generic generic = new();
 		public class Generic {
 			[Category("basic")]
 			[JsonProperty("skin")]
@@ -30,9 +30,9 @@ namespace Cryville.Crtr.Config {
 			}
 		}
 		public Dictionary<string, object> configs
-			= new Dictionary<string, object>();
+			= new();
 		public Dictionary<string, InputEntry> inputs
-			= new Dictionary<string, InputEntry>();
+			= new();
 		public class InputEntry {
 			public string handler;
 			public int type;

Assets/Cryville/Crtr/Config/RulesetConfigPropertyAdapter.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Cryville.Crtr.Config {
 	internal class RulesetConfigPropertyMasterAdapter : IPropertyMasterAdapter {
-		readonly List<RulesetConfigPropertyAdapter> _props = new List<RulesetConfigPropertyAdapter>();
+		readonly List<RulesetConfigPropertyAdapter> _props = new();
 		readonly RulesetConfigStore _store;
 		public PdtEvaluator Evaluator { get; private set; }
 
@@ -43,11 +43,11 @@ namespace Cryville.Crtr.Config {
 			_master = master;
 			_def = def;
 			Name = (string)key.Name;
-			switch (_def.type) {
-				case ConfigType.number: Type = PropertyType.Number; break;
-				case ConfigType.number_stepped: Type = PropertyType.NumberStepped; break;
-				default: Type = PropertyType.Unknown; break;
-			}
+			Type = _def.type switch {
+				ConfigType.number => PropertyType.Number,
+				ConfigType.number_stepped => PropertyType.NumberStepped,
+				_ => PropertyType.Unknown,
+			};
 			_rangeOp = new PropOp.Clip(v => {
 				m_range[0] = (double)v.Behind;
 				m_range[1] = (double)v.Ahead;
@@ -85,7 +85,7 @@ namespace Cryville.Crtr.Config {
 
 		public bool SetMapped { get { return false; } }
 
-		readonly PropStores.Float _numst = new PropStores.Float();
+		readonly PropStores.Float _numst = new();
 		public object MapValue(object value) {
 			_numst.Value = (float)(double)value;
 			if (_def.value == null) return _numst.Value;

Assets/Cryville/Crtr/Config/RulesetConfigStore.cs

@@ -6,8 +6,8 @@ using System.Collections.Generic;
 
 namespace Cryville.Crtr.Config {
 	public class RulesetConfigStore {
-		readonly IntKeyedDictionary<PropSrc> _srcs = new IntKeyedDictionary<PropSrc>();
-		readonly Dictionary<string, int> _revMap = new Dictionary<string, int>();
+		readonly IntKeyedDictionary<PropSrc> _srcs = new();
+		readonly Dictionary<string, int> _revMap = new();
 		readonly Dictionary<string, object> _values;
 		public RulesetConfigStore(Dictionary<Identifier, ConfigDefinition> defs, Dictionary<string, object> values) {
 			_values = values;

Assets/Cryville/Crtr/Config/UI/InputConfigPanel.cs

@@ -15,7 +15,7 @@ namespace Cryville.Crtr.Config.UI {
 
 		PdtRuleset _ruleset;
 		InputProxy _proxy;
-		readonly Dictionary<Identifier, InputConfigPanelEntry> _entries = new Dictionary<Identifier, InputConfigPanelEntry>();
+		readonly Dictionary<Identifier, InputConfigPanelEntry> _entries = new();
 
 		public void Load(PdtRuleset ruleset, RulesetConfig rulesetConfig) {
 			_ruleset = ruleset;

Assets/Cryville/Crtr/Config/UI/InputDialog.cs

@@ -29,7 +29,7 @@ namespace Cryville.Crtr.Config.UI {
 		int _targetDim;
 		PhysicalDimension? _targetPDim;
 		bool _targetNotNull;
-		readonly Dictionary<InputSource, InputDialogEntry> _recvsrcs = new Dictionary<InputSource, InputDialogEntry>();
+		readonly Dictionary<InputSource, InputDialogEntry> _recvsrcs = new();
 		void ShowInternal(Action<InputSource?> callback, string message, InputDefinition def, InputProxy proxy) {
 			_active = true;
 			_callback = callback;
@@ -56,7 +56,7 @@ namespace Cryville.Crtr.Config.UI {
 			var result = new PhysicalDimension();
 			foreach (var comp in comps) {
 				int dim = 1;
-				if (comp.Length > 1) dim = int.Parse(comp.Substring(1));
+				if (comp.Length > 1) dim = int.Parse(comp[1..]);
 				switch (comp[0]) {
 					case 'T': result.Time += dim; break;
 					case 'L': result.Length += dim; break;
@@ -98,8 +98,7 @@ namespace Cryville.Crtr.Config.UI {
 		Action<InputEvent> _d_HandleInputEvent;
 		void HandleInputEvent(InputEvent ev) {
 			InputSource src = ev.Identifier.Source;
-			InputDialogEntry entry;
-			if (!_recvsrcs.TryGetValue(src, out entry)) {
+			if (!_recvsrcs.TryGetValue(src, out InputDialogEntry entry)) {
 				_recvsrcs.Add(src, entry = AddSourceItem(src));
 				if (_proxy.IsUsed(src)) {
 					entry.Status |= InputDeviceStatus.Used;

Assets/Cryville/Crtr/Config/UI/InputDialogEntry.cs

@@ -74,8 +74,7 @@ namespace Cryville.Crtr.Config.UI {
 		Dictionary<int, InputVector> _activeInputs;
 		public void OnInputEvent(InputEvent ev) {
 			var id = ev.Identifier.Id;
-			InputVector lastVec;
-			if (!_activeInputs.TryGetValue(id, out lastVec)) {
+			if (!_activeInputs.TryGetValue(id, out InputVector lastVec)) {
 				if (ev.To.IsNull) return;
 				_activeInputs.Add(id, lastVec = ev.To.Vector);
 			}

Assets/Cryville/Crtr/Config/UI/PVPNumberBase.cs

@@ -111,9 +111,8 @@ namespace Cryville.Crtr.Config.UI {
 			}
 
 			float GetRatioFromPos(Vector2 pos) {
-				Vector2 lp;
 				RectTransform handleArea = parent.m_handleArea;
-				if (RectTransformUtility.ScreenPointToLocalPointInRectangle(handleArea, pos, cam, out lp)) {
+				if (RectTransformUtility.ScreenPointToLocalPointInRectangle(handleArea, pos, cam, out Vector2 lp)) {
 					lp -= handleArea.rect.position;
 					return Mathf.Clamp01(lp.x / handleArea.rect.width);
 				}
@@ -121,8 +120,7 @@ namespace Cryville.Crtr.Config.UI {
 			}
 
 			void SetValueFromPos(Vector2 pos) {
-				double min, max;
-				parent.GetRange(out min, out max);
+				parent.GetRange(out double min, out double max);
 				double ratio = GetRatioFromPos(pos);
 				double result = parent.GetValue(ratio, Time.deltaTime, min, max);
 				if (result < min) result = min;

Assets/Cryville/Crtr/Config/UI/PropertyMasterPanel.cs

@@ -34,14 +34,13 @@ namespace Cryville.Crtr.Config.UI {
 			}
 		}
 
-		readonly Dictionary<string, List<IPropertyAdapter>> _categories = new Dictionary<string, List<IPropertyAdapter>>();
+		readonly Dictionary<string, List<IPropertyAdapter>> _categories = new();
 		public void LoadProperties() {
 			_categories.Clear();
 			_invalidated = false;
 			if (Adapter == null) return;
 			foreach (var p in Adapter.GetProperties()) {
-				string category = p.Category;
-				if (category == null) category = Adapter.DefaultCategory;
+				string category = p.Category ?? Adapter.DefaultCategory;
 				if (!_categories.ContainsKey(category))
 					_categories.Add(category, new List<IPropertyAdapter>());
 				_categories[category].Add(p);

Assets/Cryville/Crtr/Event/ChartHandler.cs

@@ -8,7 +8,7 @@ namespace Cryville.Crtr.Event {
 		protected override TransformHandler Parent { get { return null; } }
 
 		readonly Chart chart;
-		readonly List<LibavFileAudioSource> sounds = new List<LibavFileAudioSource>();
+		readonly List<LibavFileAudioSource> sounds = new();
 
 		public ChartHandler(Chart _chart) {
 			chart = _chart;
@@ -25,8 +25,7 @@ namespace Cryville.Crtr.Event {
 			if (s.CloneType == 16) {
 				if (ev == null) { }
 				else if (ev.Unstamped == null) { }
-				else if (ev.Unstamped is Chart.Sound) {
-					Chart.Sound tev = (Chart.Sound)ev.Unstamped;
+				else if (ev.Unstamped is Chart.Sound tev) {
 					var dir = new DirectoryInfo(Path.Combine(Game.GameDataPath, "songs", StringUtils.EscapeFileName(tev.id)));
 					var files = dir.GetFiles();
 					var source = new LibavFileAudioSource(files[0].FullName);

Assets/Cryville/Crtr/Event/ContainerHandler.cs

@@ -41,7 +41,7 @@ namespace Cryville.Crtr.Event {
 
 		protected Transform RootTransform;
 
-		readonly List<SkinComponent> _comps = new List<SkinComponent>();
+		readonly List<SkinComponent> _comps = new();
 		protected IEnumerable<SkinComponent> Components { get { return _comps; } }
 
 		public Vector3 Position { get; protected set; }
@@ -68,7 +68,7 @@ namespace Cryville.Crtr.Event {
 
 		static readonly int _var_current_time = IdentifierManager.Shared.Request("current_time");
 		static readonly int _var_invisible_bounds = IdentifierManager.Shared.Request("invisible_bounds");
-		public readonly IntKeyedDictionary<PropSrc> PropSrcs = new IntKeyedDictionary<PropSrc>();
+		public readonly IntKeyedDictionary<PropSrc> PropSrcs = new();
 		SkinContainer skinContainer;
 		protected Judge judge;
 		public void AttachSystems(PdtSkin skin, Judge judge) {
@@ -76,9 +76,9 @@ namespace Cryville.Crtr.Event {
 			this.judge = judge;
 		}
 
-		public readonly IntKeyedDictionary<List<Anchor>> Anchors = new IntKeyedDictionary<List<Anchor>>();
-		public readonly IntKeyedDictionary<Anchor> DynamicAnchors = new IntKeyedDictionary<Anchor>();
-		public readonly IntKeyedDictionary<double> DynamicAnchorSetTime = new IntKeyedDictionary<double>();
+		public readonly IntKeyedDictionary<List<Anchor>> Anchors = new();
+		public readonly IntKeyedDictionary<Anchor> DynamicAnchors = new();
+		public readonly IntKeyedDictionary<double> DynamicAnchorSetTime = new();
 		Anchor a_cur;
 		Anchor a_head;
 		Anchor a_tail;
@@ -98,8 +98,7 @@ namespace Cryville.Crtr.Event {
 				DynamicAnchors.Add(name, result);
 				DynamicAnchorSetTime.Add(name, double.NaN);
 			}
-			List<Anchor> list;
-			if (!Anchors.TryGetValue(name, out list))
+			if (!Anchors.TryGetValue(name, out List<Anchor> list))
 				Anchors.Add(name, list = new List<Anchor>());
 			list.Add(result);
 			return result;
@@ -158,8 +157,7 @@ namespace Cryville.Crtr.Event {
 		}
 		#endregion
 		public virtual void Update(ContainerState s, StampedEvent ev) {
-			if (ev is StampedEvent.Anchor) {
-				var tev = (StampedEvent.Anchor)ev;
+			if (ev is StampedEvent.Anchor tev) {
 				if (tev.Target == a_head) {
 					if (s.CloneType == 2) SetGraphicalActive(true, s);
 					else SetPreGraphicalActive(true, s);
@@ -234,7 +232,7 @@ namespace Cryville.Crtr.Event {
 			}
 		}
 		static readonly SimpleObjectPool<StampedEvent.Anchor> anchorEvPool
-			= new SimpleObjectPool<StampedEvent.Anchor>(1024);
+			= new(1024);
 		void PushAnchorEvent(ContainerState state, double time, Anchor anchor, int priority = 0, bool forced = false) {
 			var tev = anchorEvPool.Rent();
 			tev.Time = time;
@@ -245,8 +243,8 @@ namespace Cryville.Crtr.Event {
 			state.Bus.PushTempEvent(tev);
 		}
 		public virtual void Discard(ContainerState s, StampedEvent ev) {
-			if (ev is StampedEvent.Anchor) {
-				ReturnAnchorEvent((StampedEvent.Anchor)ev);
+			if (ev is StampedEvent.Anchor anchor) {
+				ReturnAnchorEvent(anchor);
 			}
 		}
 		void ReturnAnchorEvent(StampedEvent.Anchor ev) {
@@ -264,8 +262,7 @@ namespace Cryville.Crtr.Event {
 		Anchor _openedAnchor;
 		public int OpenedAnchorName { get { return _openedAnchor == null ? 0 : _openedAnchor.Name; } }
 		public bool TryGetAnchorsByName(int name, out IReadOnlyCollection<Anchor> result) {
-			List<Anchor> anchors;
-			var ret = Anchors.TryGetValue(name, out anchors);
+			var ret = Anchors.TryGetValue(name, out List<Anchor> anchors);
 			result = anchors;
 			return ret;
 		}

Assets/Cryville/Crtr/Event/ContainerState.cs

@@ -19,11 +19,11 @@ namespace Cryville.Crtr.Event {
 		public ushort Depth;
 
 		public Dictionary<EventContainer, ContainerState> Children
-			= new Dictionary<EventContainer, ContainerState>();
+			= new();
 		HashSet<EventContainer> ActiveChildren
-			= new HashSet<EventContainer>();
+			= new();
 		public Dictionary<Type, List<ContainerState>> TypedChildren
-			= new Dictionary<Type, List<ContainerState>>();
+			= new();
 
 		public ContainerState GetChild(int index, Type handlerType) {
 			var list = TypedChildren[handlerType];
@@ -110,8 +110,7 @@ namespace Cryville.Crtr.Event {
 		void AddChild(EventContainer c, ContainerState parent) {
 			parent.Children.Add(c, this);
 			Type t = c.GetType();
-			List<ContainerState> tc;
-			if (!parent.TypedChildren.TryGetValue(t, out tc))
+			if (!parent.TypedChildren.TryGetValue(t, out List<ContainerState> tc))
 				parent.TypedChildren.Add(t, tc = new List<ContainerState>());
 			tc.Add(this);
 		}
@@ -159,15 +158,13 @@ namespace Cryville.Crtr.Event {
 			if (dest.m_active) dest.Bus.NotifyActiveChanged(dest);
 
 			foreach (var mv in Values) {
-				RealtimeMotionValue dv;
-				if (dest.Values.TryGetValue(mv.Key, out dv)) mv.Value.CopyTo(dv, false);
+				if (dest.Values.TryGetValue(mv.Key, out RealtimeMotionValue dv)) mv.Value.CopyTo(dv, false);
 				else dest.Values.Add(mv.Key, mv.Value.Clone());
 			}
 
 			foreach (var cv in dest.CachedValues) cv.Value.Valid = false;
 			foreach (var cv in CachedValues) {
-				MotionCache dv;
-				if (!dest.CachedValues.TryGetValue(cv.Key, out dv)) {
+				if (!dest.CachedValues.TryGetValue(cv.Key, out MotionCache dv)) {
 					dest.CachedValues.Add(cv.Key, dv = dest._mcpa.Rent(cv.Key));
 				}
 				cv.Value.CopyTo(dv);
@@ -229,13 +226,12 @@ namespace Cryville.Crtr.Event {
 		#region Motion
 		readonly CategorizedPoolAccessor<int, RealtimeMotionValue> _rmvpa;
 		readonly CategorizedPoolAccessor<int, MotionCache> _mcpa;
-		Dictionary<StampedEvent, RealtimeMotionValue> PlayingMotions = new Dictionary<StampedEvent, RealtimeMotionValue>(4);
+		Dictionary<StampedEvent, RealtimeMotionValue> PlayingMotions = new(4);
 		IntKeyedDictionary<RealtimeMotionValue> Values;
 		IntKeyedDictionary<MotionCache> CachedValues;
 
 		void InvalidateMotion(int name) {
-			MotionCache cache;
-			if (!CachedValues.TryGetValue(name, out cache))
+			if (!CachedValues.TryGetValue(name, out MotionCache cache))
 				CachedValues.Add(name, cache = _mcpa.Rent(name));
 			cache.Valid = false;
 			foreach (var c in ActiveChildren)
@@ -243,8 +239,7 @@ namespace Cryville.Crtr.Event {
 		}
 
 		public Vector GetComputedValue(int key) {
-			MotionCache tr;
-			if (!CachedValues.TryGetValue(key, out tr))
+			if (!CachedValues.TryGetValue(key, out MotionCache tr))
 				CachedValues.Add(key, tr = _mcpa.Rent(key));
 			Vector r = tr.Value;
 			if (tr.Valid) return r;
@@ -322,8 +317,8 @@ namespace Cryville.Crtr.Event {
 
 		public void Discard(StampedEvent ev) {
 			Handler.Discard(this, ev);
-			if (ev is StampedEvent.RelativeMotion) {
-				ReturnRelativeMotionEvent((StampedEvent.RelativeMotion)ev);
+			if (ev is StampedEvent.RelativeMotion motion) {
+				ReturnRelativeMotionEvent(motion);
 			}
 			else if (ev.Origin is StampedEvent.RelativeMotion) {
 				ReturnEndRelativeMotionEvent((StampedEvent.Temporary)ev);
@@ -345,8 +340,7 @@ namespace Cryville.Crtr.Event {
 						_rmvpa.Return(mv);
 					}
 				}
-				else if (ev is StampedEvent.RelativeMotion) {
-					var tev = (StampedEvent.RelativeMotion)ev;
+				else if (ev is StampedEvent.RelativeMotion tev) {
 					var mv = _rmvpa.Rent(tev.Name);
 					mv.CloneTypeFlag = CloneType;
 					Values[tev.Name].CopyTo(mv, true);
@@ -369,13 +363,13 @@ namespace Cryville.Crtr.Event {
 				}
 				else if (ev.Origin != null) {
 					var oev = ev.Origin;
-					if (oev is StampedEvent.RelativeMotion) {
+					if (oev is StampedEvent.RelativeMotion motion) {
 						Update(ev);
 						var mv = PlayingMotions[oev];
 						if (mv.CloneTypeFlag == CloneType) _rmvpa.Return(mv);
 						PlayingMotions.Remove(oev);
 						ReturnEndRelativeMotionEvent((StampedEvent.Temporary)ev);
-						ReturnRelativeMotionEvent((StampedEvent.RelativeMotion)oev);
+						ReturnRelativeMotionEvent(motion);
 					}
 					else {
 						var nev = oev.Unstamped;
@@ -385,8 +379,7 @@ namespace Cryville.Crtr.Event {
 							if (mv.CloneTypeFlag == CloneType) _rmvpa.Return(mv);
 							PlayingMotions.Remove(oev);
 						}
-						else if (nev is EventContainer) {
-							var cev = (EventContainer)nev;
+						else if (nev is EventContainer cev) {
 							var ccs = Children[cev];
 							UpdateMotions();
 							ccs.LogicalActive = false;
@@ -455,8 +448,8 @@ namespace Cryville.Crtr.Event {
 				}
 			}
 		}
-		static readonly PropStores.Float _ttimest = new PropStores.Float();
-		static readonly PropStores.Vector4 _transst = new PropStores.Vector4();
+		static readonly PropStores.Float _ttimest = new();
+		static readonly PropStores.Vector4 _transst = new();
 		Vector4 GetTransition(float time, PdtExpression transition) {
 			if (time >= 1) return Vector4.one;
 			if (transition == null) return new Vector4(time, time, time, time);
@@ -495,9 +488,9 @@ namespace Cryville.Crtr.Event {
 		}
 
 		static readonly SimpleObjectPool<StampedEvent.RelativeMotion> relmEvPool
-			= new SimpleObjectPool<StampedEvent.RelativeMotion>(1024);
+			= new(1024);
 		static readonly SimpleObjectPool<StampedEvent.Temporary> erelmEvPool
-			= new SimpleObjectPool<StampedEvent.Temporary>(1024);
+			= new(1024);
 		public void PreAnchor() {
 			PushRelativeMotions(Handler.ns.Bus);
 			Handler.PreAnchor();

Assets/Cryville/Crtr/Event/EventBatch.cs

@@ -9,7 +9,7 @@ namespace Cryville.Crtr.Event {
 			private set;
 		}
 
-		readonly List<StampedEvent> queue = new List<StampedEvent>();
+		readonly List<StampedEvent> queue = new();
 		public int Count {
 			get { return queue.Count; }
 		}

Assets/Cryville/Crtr/Event/EventBatcher.cs

@@ -12,16 +12,16 @@ namespace Cryville.Crtr.Event {
 		readonly Chart chart;
 		ContainerState rootState;
 		readonly Dictionary<ChartEvent, ContainerState> containerMap
-			= new Dictionary<ChartEvent, ContainerState>();
+			= new();
 		readonly Dictionary<EventContainer, ContainerState> stateMap
-			= new Dictionary<EventContainer, ContainerState>();
+			= new();
 		readonly Dictionary<ChartEvent, StampedEvent> map
-			= new Dictionary<ChartEvent, StampedEvent>();
+			= new();
 		readonly Dictionary<EventContainer, List<StampedEvent>> coeventMap
-			= new Dictionary<EventContainer, List<StampedEvent>>();
-		readonly HashSet<ChartEvent> coevents = new HashSet<ChartEvent>();
-		readonly List<StampedEvent> stampedEvents = new List<StampedEvent>();
-		readonly List<EventBatch> batches = new List<EventBatch>();
+			= new();
+		readonly HashSet<ChartEvent> coevents = new();
+		readonly List<StampedEvent> stampedEvents = new();
+		readonly List<EventBatch> batches = new();
 
 		double beat;
 		float tempo;
@@ -58,8 +58,8 @@ namespace Cryville.Crtr.Event {
 				}
 				Events.Add(ev);
 				containerMap.Add(ev, cs);
-				if (ev is EventContainer)
-					AddEventContainer((EventContainer)ev, cs);
+				if (ev is EventContainer container)
+					AddEventContainer(container, cs);
 			}
 		}
 		
@@ -104,17 +104,16 @@ namespace Cryville.Crtr.Event {
 					var pev = map[oev];
 					pev.ReleaseEvent = sev;
 					sev.Origin = pev;
-					if (oev is EventContainer) {
+					if (oev is EventContainer container) {
 						stampedEvents.Add(new StampedEvent.ClipAhead {
 							Container = con,
 							Origin = pev,
-							Time = etime + ((EventContainer)oev).Clip.Ahead,
+							Time = etime + container.Clip.Ahead,
 						});
 					}
 				}
 				if (con != null && coevents.Contains(ev)) {
-					List<StampedEvent> cevs;
-					if (!coeventMap.TryGetValue(con, out cevs)) {
+					if (!coeventMap.TryGetValue(con, out List<StampedEvent> cevs)) {
 						coeventMap.Add(con, cevs = new List<StampedEvent>());
 					}
 					cevs.Add(sev);
@@ -168,9 +167,8 @@ namespace Cryville.Crtr.Event {
 		}
 
 		void BatchCoevents(StampedEvent ev, List<StampedEvent> ocevs = null) {
-			if (!(ev.Unstamped is EventContainer)) return;
-			List<StampedEvent> cevs;
-			if (coeventMap.TryGetValue((EventContainer)ev.Unstamped, out cevs)) {
+			if (ev.Unstamped is not EventContainer container) return;
+			if (coeventMap.TryGetValue(container, out List<StampedEvent> cevs)) {
 				var rootFlag = ocevs == null;
 				if (rootFlag) ev.Coevents = ocevs = new List<StampedEvent>();
 				foreach (var cev in cevs) {

Assets/Cryville/Crtr/Event/EventBus.cs

@@ -12,11 +12,11 @@ namespace Cryville.Crtr.Event {
 		}
 
 		Dictionary<EventContainer, ContainerState> states
-			= new Dictionary<EventContainer, ContainerState>();
+			= new();
 		HashSet<ContainerState> activeStates
-			= new HashSet<ContainerState>();
+			= new();
 		HashSet<ContainerState> invalidatedStates
-			= new HashSet<ContainerState>();
+			= new();
 		public int ActiveStateCount { get { return activeStates.Count; } }
 
 		public EventBus(ContainerState root, List<EventBatch> b) : base(b) {
@@ -84,14 +84,14 @@ namespace Cryville.Crtr.Event {
 				s.Value.AttachSystems(skin, judge);
 		}
 
-		List<StampedEvent.Temporary> tempEvents = new List<StampedEvent.Temporary>();
+		List<StampedEvent.Temporary> tempEvents = new();
 		public void PushTempEvent(StampedEvent.Temporary ev) {
 			var index = tempEvents.BinarySearch(ev);
 			if (index < 0) index = ~index;
 			tempEvents.Insert(index, ev);
 		}
 
-		readonly StampedEvent.Temporary _dummyEvent = new StampedEvent.Temporary();
+		readonly StampedEvent.Temporary _dummyEvent = new();
 		public void StripTempEvents() {
 			_dummyEvent.Time = Time;
 			var index = tempEvents.BinarySearch(_dummyEvent);

Assets/Cryville/Crtr/Event/GroupHandler.cs

@@ -39,7 +39,7 @@ namespace Cryville.Crtr.Event {
 	}
 
 	class Vector3Operator : IVectorOperator<Vector3> {
-		public static Vector3Operator Instance = new Vector3Operator();
+		public static Vector3Operator Instance = new();
 
 		public Vector3 Add(Vector3 lhs, Vector3 rhs) {
 			return lhs + rhs;

Assets/Cryville/Crtr/Event/MotionCache.cs

@@ -21,8 +21,9 @@ namespace Cryville.Crtr.Event {
 				_reg = ChartPlayer.motionRegistry[name];
 			}
 			protected override MotionCache Construct() {
-				var result = new MotionCache();
-				result.Value = (Vector)Activator.CreateInstance(_reg.Type);
+				var result = new MotionCache {
+					Value = (Vector)Activator.CreateInstance(_reg.Type)
+				};
 				return result;
 			}
 			protected override void Reset(MotionCache obj) {

Assets/Cryville/Crtr/Event/NoteHandler.cs

@@ -17,15 +17,15 @@ namespace Cryville.Crtr.Event {
 		public override string TypeName { get { return "note"; } }
 
 		SectionalGameObject[] sgos;
-		readonly Dictionary<Chart.Judge, JudgeState> judges = new Dictionary<Chart.Judge, JudgeState>();
+		readonly Dictionary<Chart.Judge, JudgeState> judges = new();
 		class JudgeState {
 			static readonly int _var_judge_result = IdentifierManager.Shared.Request("judge_result");
 			static readonly int _var_judge_time_absolute = IdentifierManager.Shared.Request("judge_time_absolute");
 			static readonly int _var_judge_time_relative = IdentifierManager.Shared.Request("judge_time_relative");
 			public Anchor StaticAnchor { get; private set; }
-			readonly PropStores.Float _jtabsst = new PropStores.Float();
-			readonly PropStores.Float _jtrelst = new PropStores.Float();
-			readonly PropStores.Identifier _resultst = new PropStores.Identifier();
+			readonly PropStores.Float _jtabsst = new();
+			readonly PropStores.Float _jtrelst = new();
+			readonly PropStores.Identifier _resultst = new();
 			public JudgeState(NoteHandler handler, int name) {
 				StaticAnchor = handler.RegisterAnchor(handler.judge.judgeMap[name], false, 3);
 			}
@@ -147,8 +147,7 @@ namespace Cryville.Crtr.Event {
 		}
 
 		internal void ReportJudge(JudgeEvent ev, float time, Identifier result) {
-			JudgeState state;
-			if (!judges.TryGetValue(ev.BaseEvent, out state)) return;
+			if (!judges.TryGetValue(ev.BaseEvent, out JudgeState state)) return;
 			state.MarkJudged(time, (float)(ev.StartTime - time), result.Key);
 		}
 	}

Assets/Cryville/Crtr/Event/RealtimeMotionValue.cs

@@ -48,21 +48,19 @@ namespace Cryville.Crtr.Event {
 		}
 
 		public MotionNode GetRelativeNode(short id) {
-			MotionNode result;
-			RelativeNodes.TryGetValue(id, out result);
+			RelativeNodes.TryGetValue(id, out MotionNode result);
 			return result;
 		}
 
 		public void SetRelativeNode(MotionNode node) {
-			MotionNode cnode;
-			if (!RelativeNodes.TryGetValue(node.Id, out cnode)) {
+			if (!RelativeNodes.TryGetValue(node.Id, out MotionNode cnode)) {
 				cnode = MotionNodePool.Shared.Rent(_type);
 				cnode.Id = node.Id;
 				RelativeNodes.Add(node.Id, cnode);
 			}
-			if (node.Time != null) node.Time.CopyTo(cnode.Time);
-			if (node.EndTime != null) node.EndTime.CopyTo(cnode.EndTime);
-			if (node.Value != null) node.Value.CopyTo(cnode.Value);
+			node.Time?.CopyTo(cnode.Time);
+			node.EndTime?.CopyTo(cnode.EndTime);
+			node.Value?.CopyTo(cnode.Value);
 		}
 
 		/// <summary>

Assets/Cryville/Crtr/Event/TransformHandler.cs

@@ -7,7 +7,7 @@ namespace Cryville.Crtr.Event {
 		protected abstract TransformHandler Parent { get; }
 		public override void Init() {
 			base.Init();
-			sgos = Components.Where(c => c is SectionalGameObject).Cast<SectionalGameObject>().ToArray();
+			sgos = Components.OfType<SectionalGameObject>().ToArray();
 		}
 
 		SectionalGameObject[] sgos;

Assets/Cryville/Crtr/Extensions/ExtensionImporter.cs

@@ -12,9 +12,8 @@ namespace Cryville.Crtr.Extensions {
 
 		public override void Convert(FileInfo file, ConversionSession ses) {
 			try {
-				using (var stream = file.OpenRead()) {
-					ModuleDefinition.ReadModule(stream, new ReaderParameters(ReadingMode.Immediate));
-				}
+				using var stream = file.OpenRead();
+				ModuleDefinition.ReadModule(stream, new ReaderParameters(ReadingMode.Immediate));
 			}
 			catch (BadImageFormatException ex) {
 				throw new FormatException("Invalid extension.", ex);

Assets/Cryville/Crtr/Extensions/Umg/ChartResourceImporter.cs

@@ -13,19 +13,17 @@ namespace Cryville.Crtr.Extensions.Umg {
 		public override void Convert(FileInfo file, ConversionSession ses) {
 			var meta = Path.Combine(file.Directory.FullName, "meta.json");
 			if (!File.Exists(meta)) throw new FileNotFoundException("Meta file for the chart not found");
-			using (StreamReader reader = new StreamReader(meta, Encoding.UTF8)) {
-				var data = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
-				ses.AddResource(new ChartResource(data.name, file));
-			}
+			using StreamReader reader = new(meta, Encoding.UTF8);
+			var data = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+			ses.AddResource(new ChartResource(data.name, file));
 		}
 	}
 	public class ChartResource : FileResource {
 		public ChartResource(string name, FileInfo master) : base(name, master) {
-			using (var reader = new StreamReader(master.FullName)) {
-				var meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
-				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".json")));
-				if (meta.cover != null) Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.cover)));
-			}
+			using var reader = new StreamReader(master.FullName);
+			var meta = JsonConvert.DeserializeObject<ChartMeta>(reader.ReadToEnd());
+			Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".json")));
+			if (meta.cover != null) Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.cover)));
 		}
 	}
 }

Assets/Cryville/Crtr/Extensions/Umg/RulesetResourceImporter.cs

@@ -12,18 +12,16 @@ namespace Cryville.Crtr.Extensions.Umg {
 		}
 
 		public override void Convert(FileInfo file, ConversionSession ses) {
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				var data = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd());
-				ses.AddResource(new RulesetResource(data.name, file));
-			}
+			using StreamReader reader = new(file.FullName, Encoding.UTF8);
+			var data = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd());
+			ses.AddResource(new RulesetResource(data.name, file));
 		}
 	}
 	public class RulesetResource : FileResource {
 		public RulesetResource(string name, FileInfo master) : base(name, master) {
-			using (var reader = new StreamReader(master.FullName)) {
-				var meta = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd());
-				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
-			}
+			using var reader = new StreamReader(master.FullName);
+			var meta = JsonConvert.DeserializeObject<RulesetDefinition>(reader.ReadToEnd());
+			Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
 		}
 	}
 }

Assets/Cryville/Crtr/Extensions/Umg/SkinResourceImporter.cs

@@ -12,22 +12,20 @@ namespace Cryville.Crtr.Extensions.Umg {
 		}
 
 		public override void Convert(FileInfo file, ConversionSession ses) {
-			using (StreamReader reader = new StreamReader(file.FullName, Encoding.UTF8)) {
-				var data = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd());
-				ses.AddResource(new SkinResource(data.name, file));
-			}
+			using StreamReader reader = new(file.FullName, Encoding.UTF8);
+			var data = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd());
+			ses.AddResource(new SkinResource(data.name, file));
 		}
 	}
 	public class SkinResource : FileResource {
 		public string RulesetName { get; private set; }
 		public SkinResource(string name, FileInfo master) : base(name, master) {
-			using (var reader = new StreamReader(master.FullName)) {
-				var meta = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd());
-				RulesetName = meta.ruleset;
-				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
-				foreach (var frame in meta.frames) {
-					Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, frame)));
-				}
+			using var reader = new StreamReader(master.FullName);
+			var meta = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd());
+			RulesetName = meta.ruleset;
+			Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, meta.data + ".pdt")));
+			foreach (var frame in meta.frames) {
+				Attachments.Add(new FileInfo(Path.Combine(master.Directory.FullName, frame)));
 			}
 		}
 	}

Assets/Cryville/Crtr/Game.cs

@@ -36,10 +36,10 @@ namespace Cryville.Crtr {
 		public static SimpleSequencerSource AudioSequencer;
 		public static SimpleSequencerSession AudioSession;
 		public static InputManager InputManager;
-		public static readonly NetworkTaskWorker NetworkTaskWorker = new NetworkTaskWorker();
+		public static readonly NetworkTaskWorker NetworkTaskWorker = new();
 
 		public static readonly JsonSerializerSettings GlobalJsonSerializerSettings
-			= new JsonSerializerSettings() {
+			= new() {
 				DefaultValueHandling = DefaultValueHandling.Ignore,
 			};
 
@@ -168,10 +168,9 @@ namespace Cryville.Crtr {
 			if (!dir.Exists || Settings.Default.LastRunVersion != Application.version) {
 				Directory.CreateDirectory(dir.FullName);
 				var defaultData = Resources.Load<TextAsset>("default");
-				using (var zip = ZipFile.Read(defaultData.bytes)) {
-					zip.ExtractExistingFile = ExtractExistingFileAction.OverwriteSilently;
-					zip.ExtractAll(Settings.Default.GameDataPath);
-				}
+				using var zip = ZipFile.Read(defaultData.bytes);
+				zip.ExtractExistingFile = ExtractExistingFileAction.OverwriteSilently;
+				zip.ExtractAll(Settings.Default.GameDataPath);
 			}
 
 			Settings.Default.LastRunVersion = Application.version;
@@ -193,18 +192,16 @@ namespace Cryville.Crtr {
 		}
 
 		static readonly Encoding _encoding = new UTF8Encoding(false, true);
-		static readonly XmlReaderSettings _xmlSettings = new XmlReaderSettings {
+		static readonly XmlReaderSettings _xmlSettings = new() {
 			DtdProcessing = DtdProcessing.Ignore,
 		};
 		static XDocument LoadXmlDocument(string path) {
 			return LoadXmlDocument(Resources.Load<TextAsset>(path));
 		}
 		static XDocument LoadXmlDocument(TextAsset asset) {
-			using (var stream = new MemoryStream(_encoding.GetBytes(asset.text))) {
-				using (var reader = XmlReader.Create(stream, _xmlSettings)) {
-					return XDocument.Load(reader);
-				}
-			}
+			using var stream = new MemoryStream(_encoding.GetBytes(asset.text));
+			using var reader = XmlReader.Create(stream, _xmlSettings);
+			return XDocument.Load(reader);
 		}
 
 		static bool _shutdown;
@@ -233,15 +230,13 @@ namespace Cryville.Crtr {
 		}
 
 		static void OnInternalLog(string condition, string stackTrace, LogType type) {
-			int l;
-			switch (type) {
-				case LogType.Log: l = 1; break;
-				case LogType.Assert: l = 2; break;
-				case LogType.Warning: l = 3; break;
-				case LogType.Error:
-				case LogType.Exception: l = 4; break;
-				default: l = 1; break;
-			}
+			var l = type switch {
+				LogType.Log => 1,
+				LogType.Assert => 2,
+				LogType.Warning => 3,
+				LogType.Error or LogType.Exception => 4,
+				_ => 1,
+			};
 			MainLogger.Log(l, "Internal", "{0}\n{1}", condition, stackTrace);
 		}
 

Assets/Cryville/Crtr/JsonPdtExpConverter.cs

@@ -4,7 +4,7 @@ using System;
 
 namespace Cryville.Crtr {
 	public class JsonPdtExpConverter : JsonConverter<PdtExpression> {
-		static readonly PdtFragmentInterpreter _itor = new PdtFragmentInterpreter();
+		static readonly PdtFragmentInterpreter _itor = new();
 		public override PdtExpression ReadJson(JsonReader reader, Type objectType, PdtExpression existingValue, bool hasExistingValue, JsonSerializer serializer) {
 			_itor.SetSource((string)reader.Value);
 			return _itor.GetExp();

Assets/Cryville/Crtr/Motion.cs

@@ -6,19 +6,19 @@ using System.Globalization;
 using UnityEngine;
 
 namespace Cryville.Crtr {
-	public struct MotionRegistry {
+	public readonly struct MotionRegistry {
 		readonly Type m_Type;
-		public Type Type {
+		public readonly Type Type {
 			get { return m_Type; }
 		}
 
 		readonly Vector m_InitValue;
-		public Vector InitValue {
+		public readonly Vector InitValue {
 			get { return m_InitValue.Clone(); }
 		}
 
 		readonly Vector m_GlobalInitValue;
-		public Vector GlobalInitValue {
+		public readonly Vector GlobalInitValue {
 			get { return m_GlobalInitValue.Clone(); }
 		}
 
@@ -43,9 +43,9 @@ namespace Cryville.Crtr {
 		public Vector Value;
 
 		public void Init(Type type) {
-			if (Time == null) Time = new Vec1(float.NegativeInfinity);
-			if (EndTime == null) EndTime = new Vec1(float.NegativeInfinity);
-			if (Value == null) Value = (Vector)Activator.CreateInstance(type);
+			Time ??= new Vec1(float.NegativeInfinity);
+			EndTime ??= new Vec1(float.NegativeInfinity);
+			Value ??= (Vector)Activator.CreateInstance(type);
 		}
 
 		public void CopyTo(MotionNode dest) {
@@ -407,8 +407,7 @@ namespace Cryville.Crtr {
 				values = new float[] { op.AsNumber() };
 			}
 			else if (op.Type == PdtInternalType.Vector) {
-				int type;
-				op.GetArraySuffix(out type, out _);
+				op.GetArraySuffix(out int type, out _);
 				if (type != PdtInternalType.Number)
 					throw new InvalidOperationException("Not a vector of numbers");
 				values = new float[(op.Length - sizeof(int)) / sizeof(float)];

Assets/Cryville/Crtr/Network/UpdateChecker.cs

@@ -33,7 +33,7 @@ namespace Cryville.Crtr.Network {
 				if (_shutdown) Application.Quit();
 			}
 		}
-		static readonly Uri BaseUri = new Uri("https://www.cryville.world/api/crtr/index");
+		static readonly Uri BaseUri = new("https://www.cryville.world/api/crtr/index");
 		List<VersionInfo> _versions;
 		void ThreadLogic() {
 			try {
@@ -48,10 +48,9 @@ namespace Cryville.Crtr.Network {
 		void CheckVersion() {
 			using (var client = new Https11Client(BaseUri)) {
 				client.Connect();
-				using (var response = client.Request("GET", new Uri(BaseUri, "versions"))) {
-					var data = Encoding.UTF8.GetString(response.MessageBody.ReadToEnd());
-					_versions = JsonConvert.DeserializeObject<List<VersionInfo>>(data, Game.GlobalJsonSerializerSettings);
-				}
+				using var response = client.Request("GET", new Uri(BaseUri, "versions"));
+				var data = Encoding.UTF8.GetString(response.MessageBody.ReadToEnd());
+				_versions = JsonConvert.DeserializeObject<List<VersionInfo>>(data, Game.GlobalJsonSerializerSettings);
 			}
 			var availableVersions = _versions.Where(v => v.platforms.ContainsKey(PlatformConfig.Name)).ToArray();
 			var versionIndex = new Dictionary<string, int>(availableVersions.Length);
@@ -132,15 +131,12 @@ namespace Cryville.Crtr.Network {
 		}
 		void Download(VersionResourceInfo diff, string path) {
 			var uri = new Uri(diff.url);
-			using (var client = new Https11Client(uri)) {
-				client.Connect();
-				using (var response = client.Request("GET", uri)) {
-					var data = response.MessageBody.ReadToEnd();
-					using (var file = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None)) {
-						file.Write(data);
-					}
-				}
-			}
+			using var client = new Https11Client(uri);
+			client.Connect();
+			using var response = client.Request("GET", uri);
+			var data = response.MessageBody.ReadToEnd();
+			using var file = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None);
+			file.Write(data);
 		}
 		void ExecuteUpdate(List<string> diffPaths) {
 #if UNITY_EDITOR

Assets/Cryville/Crtr/NetworkTaskWorkerTicker.cs

@@ -10,10 +10,10 @@ namespace Cryville.Crtr {
 		void Awake() {
 			_image = GetComponent<Image>();
 		}
-		static Color _idleColor = new Color(1, 1, 1, .5f);
-		static Color _tickColor1 = new Color(1, 1, 1, 1);
-		static Color _tickColor2 = new Color(1, 1, 1, .8f);
-		static Color _suspendedColor = new Color(1, 0, 0, 1);
+		static Color _idleColor = new(1, 1, 1, .5f);
+		static Color _tickColor1 = new(1, 1, 1, 1);
+		static Color _tickColor2 = new(1, 1, 1, .8f);
+		static Color _suspendedColor = new(1, 0, 0, 1);
 		void Update() {
 			var status = Game.NetworkTaskWorker.TickBackgroundTasks();
 			if (_image == null) return;

Assets/Cryville/Crtr/PdtBinder.cs

@@ -26,7 +26,7 @@ namespace Cryville.Crtr {
 					return result;
 				}
 				else if (type.Equals(typeof(string))) {
-					string result = default(string);
+					string result = default;
 					PdtEvaluator.Instance.Evaluate(new PropOp.String(r => result = r), exp);
 					return result;
 				}
@@ -36,12 +36,12 @@ namespace Cryville.Crtr {
 					return result;
 				}
 				else if (type.Equals(typeof(Clip))) {
-					Clip result = default(Clip);
+					Clip result = default;
 					PdtEvaluator.Instance.Evaluate(new PropOp.Clip(r => result = r), exp);
 					return result;
 				}
 				else if (type.Equals(typeof(Identifier))) {
-					Identifier result = default(Identifier);
+					Identifier result = default;
 					PdtEvaluator.Instance.Evaluate(new pop_identstr(r => result = r), exp);
 					return result;
 				}
@@ -51,8 +51,7 @@ namespace Cryville.Crtr {
 					return result;
 				}
 			}
-			else if (value is string) {
-				var exp = (string)value;
+			else if (value is string exp) {
 				if (type.Equals(typeof(Identifier))) {
 					return new Identifier(exp);
 				}

Assets/Cryville/Crtr/PdtEvaluator.cs

@@ -16,13 +16,13 @@ namespace Cryville.Crtr {
 		static PdtEvaluator m_instance;
 		public static PdtEvaluator Instance {
 			get {
-				if (m_instance == null) m_instance = new PdtEvaluator();
+				m_instance ??= new PdtEvaluator();
 				return m_instance;
 			}
 		}
 
-		readonly Dictionary<PdtOperatorSignature, PdtOperator> _shortops = new Dictionary<PdtOperatorSignature, PdtOperator>();
-		readonly IntKeyedDictionary<PdtOperator> _ctxops = new IntKeyedDictionary<PdtOperator>();
+		readonly Dictionary<PdtOperatorSignature, PdtOperator> _shortops = new();
+		readonly IntKeyedDictionary<PdtOperator> _ctxops = new();
 
 		static readonly byte[] _nullbuf = new byte[0];
 		readonly byte[] _numbuf = new byte[4];
@@ -43,8 +43,7 @@ namespace Cryville.Crtr {
 			else if (name == _var_false) { LoadNum(0); type = PdtInternalType.Number; value = _numbuf; }
 			else if (name == _var_null) { LoadIdent(0); type = PdtInternalType.Undefined; value = _numbuf; }
 			else {
-				PropSrc prop; PropStores.Float variable;
-				if (ContextEvent != null && ContextEvent.PropSrcs.TryGetValue(name, out prop)) {
+				if (ContextEvent != null && ContextEvent.PropSrcs.TryGetValue(name, out PropSrc prop)) {
 					prop.Get(out type, out value);
 				}
 				else if (ContextState != null && ChartPlayer.motionRegistry.ContainsKey(new Identifier(name))) {
@@ -57,7 +56,7 @@ namespace Cryville.Crtr {
 					prop.Get(out type, out value);
 					RevokePotentialConstant();
 				}
-				else if (ContextSkinContainer != null && ContextSkinContainer.Variables.TryGetValue(name, out variable)) {
+				else if (ContextSkinContainer != null && ContextSkinContainer.Variables.TryGetValue(name, out PropStores.Float variable)) {
 					variable.Source.Get(out type, out value);
 				}
 				else if (ContextRulesetConfig != null && ContextRulesetConfig.TryGetMappedSource(name, out prop)) {
@@ -94,8 +93,7 @@ namespace Cryville.Crtr {
 		static readonly int _func_int_map = IdentifierManager.Shared.Request("int_map");
 		static readonly int _func_map = IdentifierManager.Shared.Request("map");
 		protected override PdtOperator GetOperator(PdtOperatorSignature sig) {
-			PdtOperator result;
-			if (_shortops.TryGetValue(sig, out result)) {
+			if (_shortops.TryGetValue(sig, out PdtOperator result)) {
 				return result;
 			}
 			else if (_ctxops.TryGetValue(sig.Name, out result)) {
@@ -135,7 +133,7 @@ namespace Cryville.Crtr {
 		public Judge ContextJudge { get; set; }
 		public PropSrc ContextSelfValue { get; set; }
 
-		readonly Stack<int> ContextCascadeBlocks = new Stack<int>();
+		readonly Stack<int> ContextCascadeBlocks = new();
 		public void ContextCascadeInsertBlock() {
 			ContextCascadeBlocks.Push(_cascadeHeight);
 		}
@@ -155,10 +153,9 @@ namespace Cryville.Crtr {
 			ContextCascade[_cascadeHeight - 1][key] = value;
 		}
 		public PropSrc ContextCascadeLookup(int name) {
-			PropSrc result;
 			for (int i = _cascadeHeight - 1; i >= ContextCascadeBlocks.Peek(); i--) {
 				var cas = ContextCascade[i];
-				if (cas.TryGetValue(name, out result)) {
+				if (cas.TryGetValue(name, out PropSrc result)) {
 					return result;
 				}
 			}
@@ -226,13 +223,13 @@ namespace Cryville.Crtr {
 			_ctxops.Add(IdentifierManager.Shared.Request("circle"), new func_sphere(() => ContextSelfValue));
 			_ctxops.Add(IdentifierManager.Shared.Request("sphere"), new func_sphere(() => ContextSelfValue));
 
-			Func<int, PropSrc> cccb = k => ContextCascadeLookup(k);
+			PropSrc cccb(int k) => ContextCascadeLookup(k);
 			_ctxops.Add(IdentifierManager.Shared.Request("attack_timing"), new func_attack_timing(cccb));
 			_ctxops.Add(IdentifierManager.Shared.Request("release_timing"), new func_release_timing(cccb));
 			_ctxops.Add(IdentifierManager.Shared.Request("enter_timing"), new func_enter_timing(cccb));
 			_ctxops.Add(IdentifierManager.Shared.Request("leave_timing"), new func_leave_timing(cccb));
 
-			Func<int, PdtExpression> jacb = k => ContextJudge._areaFuncs[new Identifier(k)];
+			PdtExpression jacb(int k) => ContextJudge._areaFuncs[new Identifier(k)];
 			_ctxops.Add(IdentifierManager.Shared.Request("attack_timed_area"), new func_attack_timed_area(cccb, jacb, this));
 			_ctxops.Add(IdentifierManager.Shared.Request("release_timed_area"), new func_release_timed_area(cccb, jacb, this));
 			_ctxops.Add(IdentifierManager.Shared.Request("enter_timed_area"), new func_enter_or_leave_timed_area(cccb, jacb, this, true));
@@ -450,9 +447,8 @@ namespace Cryville.Crtr {
 			}
 			protected override unsafe void Execute() {
 				var ctx = _ctxcb();
-				float dist;
 				var ray = new Ray(ctx.position, ctx.rotation * Vector3.forward);
-				ChartPlayer.frustumPlanes[(int)GetOperand(0).AsNumber()].Raycast(ray, out dist);
+				ChartPlayer.frustumPlanes[(int)GetOperand(0).AsNumber()].Raycast(ray, out float dist);
 				var ret = GetReturnFrame(PdtInternalType.Vector, sizeof(Vector3) + sizeof(int));
 				ret.Set(ray.GetPoint(dist));
 				ret.SetArraySuffix(PdtInternalType.Number);
@@ -465,12 +461,11 @@ namespace Cryville.Crtr {
 			}
 			protected override unsafe void Execute() {
 				var ret = GetReturnFrame(PdtInternalType.Number, sizeof(float));
-				float v;
-				switch (LoadedOperandCount) {
-					case 0: v = oputil.AsNumber(_ctxcb()); break;
-					case 1: v = GetOperand(0).AsNumber(); break;
-					default: throw new ArgumentException("Argument count not 0 or 1");
-				}
+				var v = LoadedOperandCount switch {
+					0 => oputil.AsNumber(_ctxcb()),
+					1 => GetOperand(0).AsNumber(),
+					_ => throw new ArgumentException("Argument count not 0 or 1"),
+				};
 				ret.SetNumber(Mathf.Floor(v));
 			}
 		}
@@ -506,12 +501,11 @@ namespace Cryville.Crtr {
 			protected override unsafe void Execute() {
 				var ret = GetReturnFrame(PdtInternalType.Number, sizeof(float));
 				float a = GetOperand(0).AsNumber();
-				float b;
-				switch (LoadedOperandCount) {
-					case 1: b = oputil.AsNumber(_ctxcb()); break;
-					case 2: b = GetOperand(1).AsNumber(); break;
-					default: throw new ArgumentException("Argument count not 2 or 3");
-				}
+				var b = LoadedOperandCount switch {
+					1 => oputil.AsNumber(_ctxcb()),
+					2 => GetOperand(1).AsNumber(),
+					_ => throw new ArgumentException("Argument count not 2 or 3"),
+				};
 				ret.SetNumber(Mathf.Min(a, b));
 			}
 		}
@@ -523,12 +517,11 @@ namespace Cryville.Crtr {
 			protected override unsafe void Execute() {
 				var ret = GetReturnFrame(PdtInternalType.Number, sizeof(float));
 				var a = GetOperand(0).AsNumber();
-				float b;
-				switch (LoadedOperandCount) {
-					case 1: b = oputil.AsNumber(_ctxcb()); break;
-					case 2: b = GetOperand(1).AsNumber(); break;
-					default: throw new ArgumentException("Argument count not 2 or 3");
-				}
+				var b = LoadedOperandCount switch {
+					1 => oputil.AsNumber(_ctxcb()),
+					2 => GetOperand(1).AsNumber(),
+					_ => throw new ArgumentException("Argument count not 2 or 3"),
+				};
 				ret.SetNumber(Mathf.Max(a, b));
 			}
 		}
@@ -539,12 +532,11 @@ namespace Cryville.Crtr {
 			}
 			protected override unsafe void Execute() {
 				var ret = GetReturnFrame(PdtInternalType.Number, sizeof(float));
-				float arg;
-				switch (LoadedOperandCount) {
-					case 0: arg = oputil.AsNumber(_ctxcb()); break;
-					case 1: arg = GetOperand(0).AsNumber(); break;
-					default: throw new ArgumentException("Argument count not 0 or 1");
-				}
+				var arg = LoadedOperandCount switch {
+					0 => oputil.AsNumber(_ctxcb()),
+					1 => GetOperand(0).AsNumber(),
+					_ => throw new ArgumentException("Argument count not 0 or 1"),
+				};
 				ret.SetNumber(Mathf.Abs(arg));
 			}
 		}
@@ -623,12 +615,11 @@ namespace Cryville.Crtr {
 			protected override unsafe void Execute() {
 				float x1 = GetOperand(0).AsNumber(), y1 = GetOperand(1).AsNumber();
 				float x2 = GetOperand(2).AsNumber(), y2 = GetOperand(3).AsNumber();
-				float time;
-				switch (LoadedOperandCount) {
-					case 4: time = oputil.AsNumber(_ctxcb()); break;
-					case 5: time = GetOperand(4).AsNumber(); break;
-					default: throw new ArgumentException("Argument count not 4 or 5");
-				}
+				var time = LoadedOperandCount switch {
+					4 => oputil.AsNumber(_ctxcb()),
+					5 => GetOperand(4).AsNumber(),
+					_ => throw new ArgumentException("Argument count not 4 or 5"),
+				};
 				GetReturnFrame(PdtInternalType.Number, sizeof(float))
 					.SetNumber(CubicBezier.Evaluate(time, x1, y1, x2, y2, 1e-3f));
 			}
@@ -642,12 +633,11 @@ namespace Cryville.Crtr {
 				_ctxcb = ctxcb;
 			}
 			protected override void Execute() {
-				float time;
-				switch (LoadedOperandCount) {
-					case 0: time = oputil.AsNumber(_ctxcb()); break;
-					case 1: time = GetOperand(0).AsNumber(); break;
-					default: throw new ArgumentException("Argument count not 0 or 1");
-				}
+				var time = LoadedOperandCount switch {
+					0 => oputil.AsNumber(_ctxcb()),
+					1 => GetOperand(0).AsNumber(),
+					_ => throw new ArgumentException("Argument count not 0 or 1"),
+				};
 				GetReturnFrame(PdtInternalType.Number, sizeof(float))
 					.SetNumber(CubicBezier.Evaluate(time, x1, y1, x2, y2, 1e-3f));
 			}
@@ -1003,8 +993,7 @@ namespace Cryville.Crtr {
 		static unsafe class oputil {
 			public static float AsNumber(PropSrc src) {
 				if (src == null) throw new ArgumentNullException("src");
-				int type; byte[] value;
-				src.Get(out type, out value);
+				src.Get(out int type, out byte[] value);
 				if (type != PdtInternalType.Number && type != PdtInternalType.Vector)
 					throw new ArgumentException("Not a number");
 				fixed (byte* ptr = value) {
@@ -1013,8 +1002,7 @@ namespace Cryville.Crtr {
 			}
 			public static Vector4? AsVector(PropSrc src) {
 				if (src == null) throw new ArgumentNullException("src");
-				int type; byte[] value;
-				src.Get(out type, out value);
+				src.Get(out int type, out byte[] value);
 				if (type == PdtInternalType.Vector) {
 					fixed (byte* ptr = value) {
 						return *(Vector4*)ptr;
@@ -1032,13 +1020,13 @@ namespace Cryville.Crtr {
 			}
 			public static Vector4? AsVector(PdtVariableMemory op) {
 				if (op.Type == PdtInternalType.Vector) {
-					switch ((op.Length - sizeof(int)) / sizeof(float)) {
-						case 0: return null;
-						case 1: return new Vector4(op.AsNumber(), 0, 0, 0);
-						case 2: return new Vector4(op.AsNumber(), op.AsNumber(sizeof(float)), 0, 0);
-						case 3: return new Vector4(op.AsNumber(), op.AsNumber(sizeof(float)), op.AsNumber(2 * sizeof(float)), 0);
-						default: return new Vector4(op.AsNumber(), op.AsNumber(sizeof(float)), op.AsNumber(2 * sizeof(float)), op.AsNumber(3 * sizeof(float)));
-					}
+					return ((op.Length - sizeof(int)) / sizeof(float)) switch {
+						0 => null,
+						1 => (Vector4?)new Vector4(op.AsNumber(), 0, 0, 0),
+						2 => (Vector4?)new Vector4(op.AsNumber(), op.AsNumber(sizeof(float)), 0, 0),
+						3 => (Vector4?)new Vector4(op.AsNumber(), op.AsNumber(sizeof(float)), op.AsNumber(2 * sizeof(float)), 0),
+						_ => (Vector4?)new Vector4(op.AsNumber(), op.AsNumber(sizeof(float)), op.AsNumber(2 * sizeof(float)), op.AsNumber(3 * sizeof(float))),
+					};
 				}
 				else if (op.Type == PdtInternalType.Number) {
 					return new Vector4(op.AsNumber(), 0, 0, 0);

Assets/Cryville/Crtr/PropOp.cs

@@ -65,8 +65,7 @@ namespace Cryville.Crtr {
 			public StringArray(Action<string[]> cb) : base(cb) { }
 			protected override unsafe void Execute() {
 				var op = GetOperand(0);
-				int arrtype; int len;
-				op.GetArraySuffix(out arrtype, out len);
+				op.GetArraySuffix(out int arrtype, out int len);
 				if (arrtype != PdtInternalType.String) throw new InvalidCastException("Not an array of strings");
 				var result = new string[len];
 				int o = 0;
@@ -100,7 +99,7 @@ namespace Cryville.Crtr {
 		}
 		public class Enum : Fixed<object> {
 			readonly Type _type;
-			readonly IntKeyedDictionary<int> _cache = new IntKeyedDictionary<int>();
+			readonly IntKeyedDictionary<int> _cache = new();
 			public Enum(Type type, Action<object> cb) : base(cb) {
 				if (!type.IsEnum)
 					throw new ArgumentException("Type is not enum");
@@ -117,7 +116,7 @@ namespace Cryville.Crtr {
 			}
 		}
 		public class Enum<T> : Fixed<T> {
-			static readonly IntKeyedDictionary<int> _cache = new IntKeyedDictionary<int>();
+			static readonly IntKeyedDictionary<int> _cache = new();
 			readonly Func<int, T> _caster;
 			static Enum() {
 				if (!typeof(T).IsEnum)

Assets/Cryville/Crtr/Ruleset/InputProxy.cs

@@ -38,10 +38,10 @@ namespace Cryville.Crtr.Ruleset {
 			}
 		}
 		#region Settings
-		readonly Dictionary<Identifier, InputProxyEntry> _tproxies = new Dictionary<Identifier, InputProxyEntry>();
-		readonly Dictionary<InputSource, InputProxyEntry> _sproxies = new Dictionary<InputSource, InputProxyEntry>();
-		readonly Dictionary<Identifier, int> _use = new Dictionary<Identifier, int>();
-		readonly Dictionary<Identifier, List<Identifier>> _rev = new Dictionary<Identifier, List<Identifier>>();
+		readonly Dictionary<Identifier, InputProxyEntry> _tproxies = new();
+		readonly Dictionary<InputSource, InputProxyEntry> _sproxies = new();
+		readonly Dictionary<Identifier, int> _use = new();
+		readonly Dictionary<Identifier, List<Identifier>> _rev = new();
 		public event EventHandler<ProxyChangedEventArgs> ProxyChanged;
 		public void LoadFrom(Dictionary<string, RulesetConfig.InputEntry> config) {
 			foreach (var cfg in config) {
@@ -140,8 +140,7 @@ namespace Cryville.Crtr.Ruleset {
 			}
 		}
 		void BroadcastProxyChanged(Identifier name) {
-			var del = ProxyChanged;
-			if (del != null) del(this, this[name]);
+			ProxyChanged?.Invoke(this, this[name]);
 		}
 		public ProxyChangedEventArgs this[Identifier name] {
 			get {
@@ -230,8 +229,8 @@ namespace Cryville.Crtr.Ruleset {
 					int dim;
 					if (op.Type == PdtInternalType.Number) dim = 1;
 					else if (op.Type == PdtInternalType.Vector) {
-						int arrtype, _;
-						op.GetArraySuffix(out arrtype, out _);
+						int _;
+						op.GetArraySuffix(out int arrtype, out _);
 						if (arrtype != PdtInternalType.Number)
 							throw new InvalidCastException("Not a vector of numbers");
 						dim = Math.Min(3, (op.Length - sizeof(int)) / sizeof(float));
@@ -245,10 +244,10 @@ namespace Cryville.Crtr.Ruleset {
 				}
 			}
 		}
-		readonly Dictionary<InputHandler, double> _timeOrigins = new Dictionary<InputHandler, double>();
-		readonly Dictionary<Identifier, int> _targetActiveCount = new Dictionary<Identifier, int>();
-		readonly Dictionary<InputIdentifier, float> _vect = new Dictionary<InputIdentifier, float>();
-		readonly Dictionary<ProxiedInputIdentifier, Vector4> _vecs = new Dictionary<ProxiedInputIdentifier, Vector4>();
+		readonly Dictionary<InputHandler, double> _timeOrigins = new();
+		readonly Dictionary<Identifier, int> _targetActiveCount = new();
+		readonly Dictionary<InputIdentifier, float> _vect = new();
+		readonly Dictionary<ProxiedInputIdentifier, Vector4> _vecs = new();
 		double? _lockTime = null;
 		unsafe void OnInput(InputIdentifier id, InputFrame frame) {
 			var rc = id.Source.Handler.ReferenceCue;
@@ -264,10 +263,9 @@ namespace Cryville.Crtr.Ruleset {
 			Monitor.Enter(_etor);
 			try {
 				Profiler.BeginSample("InputProxy.OnInput");
-				InputProxyEntry proxy;
-				if (_sproxies.TryGetValue(id.Source, out proxy)) {
-					float ft, tt = (float)GetSyncedTime(frame.Time, id.Source.Handler);
-					if (!_vect.TryGetValue(id, out ft)) ft = tt;
+				if (_sproxies.TryGetValue(id.Source, out InputProxyEntry proxy)) {
+					float tt = (float)GetSyncedTime(frame.Time, id.Source.Handler);
+					if (!_vect.TryGetValue(id, out float ft)) ft = tt;
 					_etor.ContextCascadeInsert();
 					try {
 						if (frame.IsNull) {
@@ -293,7 +291,7 @@ namespace Cryville.Crtr.Ruleset {
 		}
 		static readonly int _var_fv = IdentifierManager.Shared.Request("input_vec_from");
 		static readonly int _var_tv = IdentifierManager.Shared.Request("input_vec_to");
-		readonly InputVectorSrc _vecsrc = new InputVectorSrc();
+		readonly InputVectorSrc _vecsrc = new();
 		unsafe void OnInput(InputIdentifier id, Identifier target, float ft, float tt, bool nullFlag, int depth = 0) {
 			if (depth >= MAX_DEPTH) throw new InputProxyException("Input propagation limit reached\nThe ruleset has invalid input definitions");
 			var def = _ruleset.inputs[target];
@@ -318,8 +316,8 @@ namespace Cryville.Crtr.Ruleset {
 			else {
 				var pid = new ProxiedInputIdentifier { Source = id, Target = target };
 				PropSrc fv, tv = _etor.ContextCascadeLookup(_var_input_vec);
-				bool hfv; Vector4 ifv;
-				if (hfv = _vecs.TryGetValue(pid, out ifv)) {
+				bool hfv; 
+				if (hfv = _vecs.TryGetValue(pid, out RVector4 ifv)) {
 					_vecsrc.Set(ifv);
 					fv = _vecsrc;
 				}
@@ -352,11 +350,10 @@ namespace Cryville.Crtr.Ruleset {
 			lock (_etor) {
 				foreach (var vec in _vecs) {
 					if (vec.Key.Source.Source.Handler != handler) continue;
-					InputProxyEntry proxy;
-					if (!_sproxies.TryGetValue(vec.Key.Source.Source, out proxy)) continue;
+					if (!_sproxies.TryGetValue(vec.Key.Source.Source, out InputProxyEntry proxy)) continue;
 
-					float ft, tt = (float)GetSyncedTime(time, handler);
-					if (_vect.TryGetValue(vec.Key.Source, out ft) && ft < tt) {
+					float tt = (float)GetSyncedTime(time, handler);
+					if (_vect.TryGetValue(vec.Key.Source, out float ft) && ft < tt) {
 						_etor.ContextCascadeInsert();
 						_vecsrcs[0].Set(vec.Value);
 						_etor.ContextCascadeUpdate(_var_input_vec, _vecsrcs[0]);
@@ -434,17 +431,17 @@ namespace Cryville.Crtr.Ruleset {
 	public struct ProxiedInputIdentifier : IEquatable<ProxiedInputIdentifier> {
 		public InputIdentifier Source { get; set; }
 		public Identifier Target { get; set; }
-		public override bool Equals(object obj) {
-			if (obj == null || !(obj is ProxiedInputIdentifier)) return false;
-			return Equals((ProxiedInputIdentifier)obj);
+		public override readonly bool Equals(object obj) {
+			if (obj == null || obj is not ProxiedInputIdentifier other) return false;
+			return Equals(other);
 		}
-		public bool Equals(ProxiedInputIdentifier other) {
+		public readonly bool Equals(ProxiedInputIdentifier other) {
 			return Source == other.Source && Target == other.Target;
 		}
-		public override int GetHashCode() {
+		public override readonly int GetHashCode() {
 			return Source.GetHashCode() ^ Target.GetHashCode();
 		}
-		public override string ToString() {
+		public override readonly string ToString() {
 			return string.Format("{0}->{1}", Source, Target);
 		}
 		public static bool operator ==(ProxiedInputIdentifier lhs, ProxiedInputIdentifier rhs) {

Assets/Cryville/Crtr/Ruleset/Judge.cs

@@ -45,10 +45,8 @@ namespace Cryville.Crtr.Ruleset {
 		internal readonly PdtEvaluator _etor;
 		readonly PdtRuleset _rs;
 		internal Dictionary<Identifier, PdtExpression> _areaFuncs;
-		readonly Dictionary<Identifier, List<JudgeEvent>> evs
-			= new Dictionary<Identifier, List<JudgeEvent>>();
-		readonly Dictionary<Identifier, List<JudgeEvent>> activeEvs
-			= new Dictionary<Identifier, List<JudgeEvent>>();
+		readonly Dictionary<Identifier, List<JudgeEvent>> evs = new();
+		readonly Dictionary<Identifier, List<JudgeEvent>> activeEvs = new();
 		static readonly int _var_pause = IdentifierManager.Shared.Request("pause");
 		readonly JudgeDefinition _judgePause;
 		static readonly IComparer<JudgeEvent> _stcmp = new JudgeEventStartTimeComparer();
@@ -59,8 +57,9 @@ namespace Cryville.Crtr.Ruleset {
 		}
 		public Judge(ChartPlayer sys, PdtRuleset rs) {
 			_sys = sys;
-			_etor = new PdtEvaluator();
-			_etor.ContextJudge = this;
+			_etor = new PdtEvaluator {
+				ContextJudge = this
+			};
 			_rs = rs;
 			_areaFuncs = rs.areas;
 			_identop = new PropOp.Identifier(v => _identbuf = new Identifier(v));
@@ -88,10 +87,9 @@ namespace Cryville.Crtr.Ruleset {
 			var tev = (Chart.Judge)sev.Unstamped;
 			InsertEvent(tev, new Clip((float)sev.Time, (float)(sev.Time + sev.Duration)), tev.Id, handler);
 		}
-		void InsertEvent(Chart.Judge ev, Clip clip, Identifier id, NoteHandler handler, JudgeCallContext call = default(JudgeCallContext)) {
+		void InsertEvent(Chart.Judge ev, Clip clip, Identifier id, NoteHandler handler, JudgeCallContext call = default) {
 			if (id.Key == _var_pause) throw new InvalidOperationException("Cannot assign the special judge \"pause\" to notes");
-			JudgeDefinition def;
-			if (!_rs.judges.TryGetValue(id, out def)) {
+			if (!_rs.judges.TryGetValue(id, out JudgeDefinition def)) {
 				throw new ArgumentException(string.Format("The chart uses a judge named \"{0}\" that is undefined in the ruleset.", id));
 			}
 			_etor.Evaluate(_identop, def.input);
@@ -113,7 +111,7 @@ namespace Cryville.Crtr.Ruleset {
 		}
 		#endregion
 		#region Judge
-		internal readonly IntKeyedDictionary<int> judgeMap = new IntKeyedDictionary<int>();
+		internal readonly IntKeyedDictionary<int> judgeMap = new();
 		void InitJudges() {
 			foreach (var i in _rs.judges) {
 				var id = i.Key;
@@ -121,8 +119,8 @@ namespace Cryville.Crtr.Ruleset {
 			}
 		}
 		static bool _flag;
-		static readonly PropOp.Boolean _flagop = new PropOp.Boolean(v => _flag = v);
-		static readonly HitOp _hitop = new HitOp();
+		static readonly PropOp.Boolean _flagop = new(v => _flag = v);
+		static readonly HitOp _hitop = new();
 		class HitOp : PdtOperator {
 			const int MAX_SORTS = 16;
 			readonly float[] _buf = new float[MAX_SORTS];
@@ -171,18 +169,18 @@ namespace Cryville.Crtr.Ruleset {
 		static readonly int _var_ft = IdentifierManager.Shared.Request("input_time_from");
 		static readonly int _var_tt = IdentifierManager.Shared.Request("input_time_to");
 		readonly PropStores.Float
-			_numst1 = new PropStores.Float(),
-			_numst2 = new PropStores.Float(),
-			_numst3 = new PropStores.Float(),
-			_numst4 = new PropStores.Float();
+			_numst1 = new(),
+			_numst2 = new(),
+			_numst3 = new(),
+			_numst4 = new();
 
 		static readonly int _var_jt = IdentifierManager.Shared.Request("hit_time");
 		static readonly int _var_jdt = IdentifierManager.Shared.Request("hit_delta_time");
 		static readonly int _var_jv = IdentifierManager.Shared.Request("hit_vec");
 		readonly PropStores.Float
-			_jnumst = new PropStores.Float(),
-			_jdnumst = new PropStores.Float();
-		readonly PropStores.Vector4 _jvecst = new PropStores.Vector4();
+			_jnumst = new(),
+			_jdnumst = new();
+		readonly PropStores.Vector4 _jvecst = new();
 
 		// Adopted from System.Collections.Generic.ArraySortHelper<T>.InternalBinarySearch(T[] array, int index, int length, T value, IComparer<T> comparer)
 		int BinarySearch(List<JudgeEvent> list, float time, int stack) {
@@ -370,17 +368,16 @@ namespace Cryville.Crtr.Ruleset {
 		}
 		#endregion
 		#region Score
-		readonly IntKeyedDictionary<int> scoreStringKeys = new IntKeyedDictionary<int>();
-		readonly IntKeyedDictionary<int> scoreStringKeysRev = new IntKeyedDictionary<int>();
-		readonly IntKeyedDictionary<PropSrc> scoreSrcs = new IntKeyedDictionary<PropSrc>();
-		readonly IntKeyedDictionary<PropOp> scoreOps = new IntKeyedDictionary<PropOp>();
-		readonly IntKeyedDictionary<ScoreDefinition> scoreDefs = new IntKeyedDictionary<ScoreDefinition>();
-		readonly IntKeyedDictionary<float> scores = new IntKeyedDictionary<float>();
-		readonly IntKeyedDictionary<string> scoreStringCache = new IntKeyedDictionary<string>();
-		readonly ArrayPool<byte> scoreStringPool = new ArrayPool<byte>();
-		readonly IntKeyedDictionary<string> scoreFormatCache = new IntKeyedDictionary<string>();
-		readonly TargetString scoreFullStr = new TargetString();
-		readonly StringBuffer scoreFullBuf = new StringBuffer();
+		readonly IntKeyedDictionary<int> scoreStringKeys = new();
+		readonly IntKeyedDictionary<int> scoreStringKeysRev = new();
+		readonly IntKeyedDictionary<PropSrc> scoreSrcs = new();
+		readonly IntKeyedDictionary<PropOp> scoreOps = new();
+		readonly IntKeyedDictionary<ScoreDefinition> scoreDefs = new();
+		readonly IntKeyedDictionary<float> scores = new();
+		readonly IntKeyedDictionary<string> scoreStringCache = new();
+		readonly ArrayPool<byte> scoreStringPool = new();
+		readonly IntKeyedDictionary<string> scoreFormatCache = new();
+		readonly StringBuffer scoreFullBuf = new();
 		void InitScores() {
 			foreach (var s in _rs.scores) {
 				var key = s.Key.Key;
@@ -404,7 +401,7 @@ namespace Cryville.Crtr.Ruleset {
 		public bool TryGetScoreSrc(int key, out PropSrc value) {
 			return scoreSrcs.TryGetValue(key, out value);
 		}
-		public TargetString GetFullFormattedScoreString() {
+		public int GetFullFormattedScoreString(ArrayPool<char> bufferPool, out char[] result) {
 			lock (_etor) {
 				bool flag = false;
 				scoreFullBuf.Clear();
@@ -414,17 +411,16 @@ namespace Cryville.Crtr.Ruleset {
 					scoreFullBuf.AppendFormat(scoreFormatCache[id], scores[id]);
 					flag = true;
 				}
-				scoreFullStr.Length = scoreFullBuf.Count;
-				var arr = scoreFullStr.TrustedAsArray();
-				scoreFullBuf.CopyTo(0, arr, 0, scoreFullBuf.Count);
-				return scoreFullStr;
+				result = bufferPool.Rent(scoreFullBuf.Count);
+				scoreFullBuf.CopyTo(0, result, 0, scoreFullBuf.Count);
+				return scoreFullBuf.Count;
 			}
 		}
 		class ScoreStringSrc : PropSrc {
 			readonly Func<float> _cb;
 			readonly string _format;
 			readonly ArrayPool<byte> _pool;
-			readonly StringBuffer _buf = new StringBuffer() { Culture = CultureInfo.InvariantCulture };
+			readonly StringBuffer _buf = new() { Culture = CultureInfo.InvariantCulture };
 			public ScoreStringSrc(ArrayPool<byte> pool, Func<float> cb, string format)
 				: base(PdtInternalType.String) {
 				_pool = pool;

Assets/Cryville/Crtr/Ruleset/JudgeAction.cs

@@ -60,7 +60,7 @@ namespace Cryville.Crtr.Ruleset {
 			}
 			public override void Optimize(PdtEvaluatorBase etor, PdtExpression value) {
 				base.Optimize(etor, value);
-				if (_op.op != default(Identifier)) PdtExpression.PatchCompound(_op.name.Key, _op.op.Key, value);
+				if (_op.op != default) PdtExpression.PatchCompound(_op.name.Key, _op.op.Key, value);
 			}
 			internal override JudgeActionResult Execute(IJudge judge, JudgeEvent ev, float time, PdtExpression exp, bool onMiss, int depth, int index) {
 				judge.UpdateScore(_op, exp);

Assets/Cryville/Crtr/Ruleset/RulesetDefinition.cs

@@ -23,10 +23,9 @@ namespace Cryville.Crtr.Ruleset {
 		public PdtRuleset Root { get; private set; }
 
 		public void LoadPdt(DirectoryInfo dir) {
-			using (StreamReader pdtreader = new StreamReader(Path.Combine(dir.FullName, data + ".pdt"), Encoding.UTF8)) {
-				var src = pdtreader.ReadToEnd();
-				Root = (PdtRuleset)new RulesetInterpreter(src, null).Interpret(typeof(PdtRuleset));
-			}
+			using StreamReader pdtreader = new(Path.Combine(dir.FullName, data + ".pdt"), Encoding.UTF8);
+			var src = pdtreader.ReadToEnd();
+			Root = (PdtRuleset)new RulesetInterpreter(src, null).Interpret(typeof(PdtRuleset));
 		}
 	}
 
@@ -99,7 +98,7 @@ namespace Cryville.Crtr.Ruleset {
 #pragma warning disable IDE1006
 		public PairList<ScoreOperation, PdtExpression> scores {
 			set {
-				if (on_hit == null) on_hit = new PairList<JudgeAction, PdtExpression>();
+				on_hit ??= new PairList<JudgeAction, PdtExpression>();
 				int i = 0;
 				foreach (var s in value) {
 					on_hit.Insert(i++, new JudgeAction.Score(s.Key), s.Value);
@@ -108,13 +107,13 @@ namespace Cryville.Crtr.Ruleset {
 		}
 		public Identifier[] pass {
 			set {
-				if (on_hit == null) on_hit = new PairList<JudgeAction, PdtExpression>();
+				on_hit ??= new PairList<JudgeAction, PdtExpression>();
 				on_hit.Add(new JudgeAction.Pass(Enumerable.Empty<string>(), value), PdtExpression.Empty);
 			}
 		}
 		public Identifier[] miss {
 			set {
-				if (on_miss == null) on_miss = new PairList<JudgeAction, PdtExpression>();
+				on_miss ??= new PairList<JudgeAction, PdtExpression>();
 				on_miss.Add(new JudgeAction.Pass(Enumerable.Empty<string>(), value), PdtExpression.Empty);
 			}
 		}
@@ -134,7 +133,7 @@ namespace Cryville.Crtr.Ruleset {
 			op = new Identifier(m.Groups[2].Value);
 		}
 		public override string ToString() {
-			if (op == default(Identifier)) return name.ToString();
+			if (op == default) return name.ToString();
 			else return string.Format("{0} {1}", name, op);
 		}
 	}
@@ -144,11 +143,11 @@ namespace Cryville.Crtr.Ruleset {
 		public string format = "";
 	}
 	public class Constraint {
-		static readonly PropOp.Arbitrary _arbop = new PropOp.Arbitrary();
+		static readonly PropOp.Arbitrary _arbop = new();
 		[ElementList]
-		public PairList<RulesetSelectors, Constraint> Elements = new PairList<RulesetSelectors, Constraint>();
+		public PairList<RulesetSelectors, Constraint> Elements = new();
 		[PropertyList]
-		public PairList<ConstraintKey, PdtExpression> Properties = new PairList<ConstraintKey, PdtExpression>();
+		public PairList<ConstraintKey, PdtExpression> Properties = new();
 		public void Optimize(PdtEvaluatorBase etor) {
 			foreach (var e in Properties) {
 				etor.Optimize(e.Value);
@@ -160,14 +159,13 @@ namespace Cryville.Crtr.Ruleset {
 		}
 		public void PrePatch(ChartEvent ev) {
 			var etor = PdtEvaluator.Instance;
-			PropSrc src;
 			etor.ContextCascadeInsert();
 			etor.ContextEvent = ev;
 			foreach (var prop in Properties) {
 				var name = prop.Key.Name;
 				switch (prop.Key.Type) {
 					case ConstraintType.Property:
-						if (ev.PropSrcs.TryGetValue(name, out src))
+						if (ev.PropSrcs.TryGetValue(name, out PropSrc src))
 							etor.ContextSelfValue = src;
 						etor.Evaluate(ev.PropOps[name], prop.Value);
 						etor.ContextSelfValue = null;
@@ -196,13 +194,11 @@ namespace Cryville.Crtr.Ruleset {
 			Type = type;
 			Name = IdentifierManager.Shared.Request(name);
 		}
-		public override string ToString() {
-			switch (Type) {
-				case ConstraintType.Property: return (string)IdentifierManager.Shared.Retrieve(Name);
-				case ConstraintType.Variable: return string.Format("@var {0}", IdentifierManager.Shared.Retrieve(Name));
-				default: return string.Format("<{0}> {1}", Type, IdentifierManager.Shared.Retrieve(Name));
-			}
-		}
+		public override string ToString() => Type switch {
+			ConstraintType.Property => (string)IdentifierManager.Shared.Retrieve(Name),
+			ConstraintType.Variable => string.Format("@var {0}", IdentifierManager.Shared.Retrieve(Name)),
+			_ => string.Format("<{0}> {1}", Type, IdentifierManager.Shared.Retrieve(Name)),
+		};
 	}
 	public enum ConstraintType {
 		Property,

Assets/Cryville/Crtr/Ruleset/RulesetInterpreter.cs

@@ -8,8 +8,8 @@ namespace Cryville.Crtr.Ruleset {
 	internal class RulesetInterpreter : PdtInterpreter {
 		public RulesetInterpreter(string src, Binder binder) : base(src, binder) { }
 
-		readonly List<RulesetSelector> s = new List<RulesetSelector>();
-		readonly HashSet<string> a = new HashSet<string>();
+		readonly List<RulesetSelector> s = new();
+		readonly HashSet<string> a = new();
 		protected override object InterpretKey(Type type) {
 			if (PairCollection<JudgeAction, PdtExpression>.IsPairCollection(type))
 				return InterpretJudgeAction();

Assets/Cryville/Crtr/Ruleset/RulesetSelectors.cs

@@ -46,8 +46,7 @@ namespace Cryville.Crtr.Ruleset {
 				return "$";
 			}
 			public override IEnumerable<ChartEvent> Match(ChartEvent ev) {
-				if (!(ev is EventList)) throw new ArgumentException("Event is not event list");
-				var tev = (EventList)ev;
+				if (ev is not EventList tev) throw new ArgumentException("Event is not event list");
 				var result = tev.Create();
 				tev.Events.Add(result); // TODO create at
 				return new ChartEvent[] { result };
@@ -60,8 +59,7 @@ namespace Cryville.Crtr.Ruleset {
 				return _type;
 			}
 			public override IEnumerable<ChartEvent> Match(ChartEvent ev) {
-				if (!(ev is EventContainer)) throw new ArgumentException("Event is not container");
-				var tev = (EventContainer)ev;
+				if (ev is not EventContainer tev) throw new ArgumentException("Event is not container");
 				return new ChartEvent[] { tev.GetEventsOfType(_type) };
 			}
 		}
@@ -70,8 +68,7 @@ namespace Cryville.Crtr.Ruleset {
 				return "#";
 			}
 			public override IEnumerable<ChartEvent> Match(ChartEvent ev) {
-				if (!(ev is EventList)) throw new ArgumentException("Event is not event list");
-				var tev = (EventList)ev;
+				if (ev is not EventList tev) throw new ArgumentException("Event is not event list");
 				return tev.Events; // TODO select at
 			}
 		}

Assets/Cryville/Crtr/Ruleset/VirtualPlayerStrategy.cs

@@ -20,10 +20,9 @@ namespace Cryville.Crtr.Ruleset {
 		public PdtVirtualPlayerStrategy Root { get; private set; }
 
 		public void LoadPdt(DirectoryInfo dir) {
-			using (StreamReader pdtreader = new StreamReader(Path.Combine(dir.FullName, data + ".pdt"), Encoding.UTF8)) {
-				var src = pdtreader.ReadToEnd();
-				Root = (PdtVirtualPlayerStrategy)new RulesetInterpreter(src, null).Interpret(typeof(PdtVirtualPlayerStrategy));
-			}
+			using StreamReader pdtreader = new(Path.Combine(dir.FullName, data + ".pdt"), Encoding.UTF8);
+			var src = pdtreader.ReadToEnd();
+			Root = (PdtVirtualPlayerStrategy)new RulesetInterpreter(src, null).Interpret(typeof(PdtVirtualPlayerStrategy));
 		}
 	}
 
@@ -39,8 +38,8 @@ namespace Cryville.Crtr.Ruleset {
 
 	public class StrategyAction {
 		[ElementList]
-		public PairList<RulesetSelectors, StrategyAction> Elements = new PairList<RulesetSelectors, StrategyAction>();
+		public PairList<RulesetSelectors, StrategyAction> Elements = new();
 		[PropertyList]
-		public PairList<ConstraintKey, PdtExpression> Properties = new PairList<ConstraintKey, PdtExpression>();
+		public PairList<ConstraintKey, PdtExpression> Properties = new();
 	}
 }

Assets/Cryville/Crtr/Settings.cs

@@ -5,7 +5,7 @@ using RangeAttribute = Cryville.Common.ComponentModel.RangeAttribute;
 
 namespace Cryville.Crtr {
 	public class Settings {
-		static readonly Settings _default = new Settings();
+		static readonly Settings _default = new();
 		[Browsable(false)]
 		public static Settings Default {
 			get {

Assets/Cryville/Crtr/Skin/Components/MeshBase.cs

@@ -14,7 +14,7 @@ namespace Cryville.Crtr.Skin.Components {
 			SubmitProperty("zindex", new PropOp.Integer(v => ZIndex = (short)v));
 		}
 
-		protected MeshWrapper mesh = new MeshWrapper();
+		protected MeshWrapper mesh = new();
 		protected Material[] materials;
 
 		short _zindex;

Assets/Cryville/Crtr/Skin/Components/PolygonSGO.cs

@@ -6,13 +6,13 @@ using UnityEngine;
 
 namespace Cryville.Crtr.Skin.Components {
 	public class PolygonSGO : SectionalGameObject {
-		static readonly SimpleObjectPool<List<Vector3>> _ptPool = new SimpleObjectPool<List<Vector3>>(1024);
-		static readonly SimpleObjectPool<List<float>> _lPool = new SimpleObjectPool<List<float>>(1024);
+		static readonly SimpleObjectPool<List<Vector3>> _ptPool = new(1024);
+		static readonly SimpleObjectPool<List<float>> _lPool = new(1024);
 
-		static readonly ListPool<int> _indexPool = new ListPool<int>();
-		static readonly ListPool<Vector3> _vertPool = new ListPool<Vector3>();
-		static readonly ListPool<Vector2> _uvPool = new ListPool<Vector2>();
-		static readonly ArrayPool<Vector2> _shapePool = new ArrayPool<Vector2>(0x100, 0x10000);
+		static readonly ListPool<int> _indexPool = new();
+		static readonly ListPool<Vector3> _vertPool = new();
+		static readonly ListPool<Vector2> _uvPool = new();
+		static readonly ArrayPool<Vector2> _shapePool = new(0x100, 0x10000);
 
 		public PolygonSGO() {
 			SubmitProperty("head", new PropOp.String(v => head.FrameName = v));
@@ -50,9 +50,9 @@ namespace Cryville.Crtr.Skin.Components {
 			return r;
 		}
 		
-		public SpriteInfo head = new SpriteInfo();
-		public SpriteInfo body = new SpriteInfo();
-		public SpriteInfo tail = new SpriteInfo();
+		public SpriteInfo head = new();
+		public SpriteInfo body = new();
+		public SpriteInfo tail = new();
 
 		List<Vector3> vertices;
 		List<float> lengths;
@@ -104,7 +104,7 @@ namespace Cryville.Crtr.Skin.Components {
 		List<Vector3> verts;
 		List<Vector2> uvs;
 		List<int> trih = null, trib = null, trit = null;
-		static readonly List<int> _emptyTris = new List<int>();
+		static readonly List<int> _emptyTris = new();
 
 		public override void Seal() {
 			if (vertCount <= 1 || sumLength == 0) return;

Assets/Cryville/Crtr/Skin/Components/SkinAnimation.cs

@@ -27,8 +27,7 @@ namespace Cryville.Crtr.Skin.Components {
 				}
 				else {
 					var id = new Identifier(value);
-					AnimationSpan anim;
-					if (!ChartPlayer.pskin.animations.TryGetValue(id, out anim)) {
+					if (!ChartPlayer.pskin.animations.TryGetValue(id, out AnimationSpan anim)) {
 						Game.MainLogger.Log(4, "Skin", "Animation {0} not found", id.Name);
 						_anim = null;
 						return;

Assets/Cryville/Crtr/Skin/Components/SpritePlane.cs

@@ -45,7 +45,7 @@ namespace Cryville.Crtr.Skin.Components {
 			}
 			else Frame = null;
 			if (_mat != null) {
-				_mat.mainTexture = Frame == null ? null : Frame.Texture;
+				_mat.mainTexture = Frame?.Texture;
 			}
 		}
 		public static bool IsNullOrEmpty(SpriteInfo sprite) {
@@ -88,7 +88,7 @@ namespace Cryville.Crtr.Skin.Components {
 				OnFrameUpdate();
 			}
 		}
-		SpriteInfo[] m_frames = new SpriteInfo[] { new SpriteInfo() };
+		SpriteInfo[] m_frames = new SpriteInfo[] { new() };
 		public string[] Frames {
 			set {
 				m_frames = new SpriteInfo[value.Length];
@@ -169,12 +169,12 @@ namespace Cryville.Crtr.Skin.Components {
 
 		protected override Vector3 BaseScale {
 			get {
-				switch (m_fit) {
-					case FitMode.none: return Vector3.one;
-					case FitMode.width: return new Vector3(1, 1, 1 / CurrentFrame.Ratio);
-					case FitMode.height: return new Vector3(CurrentFrame.Ratio, 1, 1);
-					default: throw new NotSupportedException("Unsupported fit mode");
-				}
+				return m_fit switch {
+					FitMode.none => Vector3.one,
+					FitMode.width => new Vector3(1, 1, 1 / CurrentFrame.Ratio),
+					FitMode.height => new Vector3(CurrentFrame.Ratio, 1, 1),
+					_ => throw new NotSupportedException("Unsupported fit mode"),
+				};
 			}
 		}
 

Assets/Cryville/Crtr/Skin/Components/SpriteScale3.cs

@@ -9,7 +9,7 @@ namespace Cryville.Crtr.Skin.Components {
 		}
 
 		static readonly Dictionary<float, int> uvrefl
-			= new Dictionary<float, int>() {
+			= new() {
 			{-0.5f, 0}, {-0.4f, 1}, {0.4f, 2}, {0.5f, 3},
 		};
 		static Vector2[] _origuv;
@@ -30,7 +30,7 @@ namespace Cryville.Crtr.Skin.Components {
 			}
 		}
 
-		Vector2 _border = new Vector2(0, 1);
+		Vector2 _border = new(0, 1);
 		public Vector2 Border {
 			get { return _border; }
 			set {
@@ -67,12 +67,12 @@ namespace Cryville.Crtr.Skin.Components {
 					case 3: x = 1; bx = 1; break;
 					default: throw new NotSupportedException("Built-in resource corrupted");
 				}
-				float y;
-				switch ((int)muv[i].y) {
-					case 0: y = 0; break;
-					case 3: y = 1; break;
-					default: throw new NotSupportedException("Built-in resource corrupted");
-				}
+
+				var y = (int)muv[i].y switch {
+					0 => 0,
+					3 => (float)1,
+					_ => throw new NotSupportedException("Built-in resource corrupted"),
+				};
 				_uvs[i] = frame.Frame.GetUV(x, y);
 				bx -= 0.5f; y -= 0.5f;
 				_verts[i] = new Vector3(bx, 0, y);

Assets/Cryville/Crtr/Skin/Components/SpriteText.cs

@@ -22,8 +22,7 @@ namespace Cryville.Crtr.Skin.Components {
 			protected override unsafe void Execute() {
 				var keys = GetOperand(0).AsString();
 				var values = GetOperand(1);
-				int arrtype; int len;
-				values.GetArraySuffix(out arrtype, out len);
+				values.GetArraySuffix(out int arrtype, out int len);
 				if (arrtype != PdtInternalType.String) throw new InvalidCastException("Not an array of strings");
 				if (len != keys.Length) throw new ArgumentException("Length of key not equal to frame count");
 				var result = new Dictionary<char, SpriteInfo>(len);
@@ -49,7 +48,7 @@ namespace Cryville.Crtr.Skin.Components {
 			set { m_frames = value; UpdateFrames(); }
 		}
 
-		readonly TargetString m_value = new TargetString();
+		readonly TargetString m_value = new();
 		public TargetString Value { get { return m_value; } }
 
 		public float m_size;
@@ -103,10 +102,10 @@ namespace Cryville.Crtr.Skin.Components {
 		}
 
 		float sum_x;
-		readonly Dictionary<Texture2D, MeshWrapper> meshes = new Dictionary<Texture2D, MeshWrapper>();
-		readonly Dictionary<Texture2D, List<Vector3>> verts = new Dictionary<Texture2D, List<Vector3>>();
-		readonly Dictionary<Texture2D, List<Vector2>> uvs = new Dictionary<Texture2D, List<Vector2>>();
-		readonly Dictionary<Texture2D, List<int>> tris = new Dictionary<Texture2D, List<int>>();
+		readonly Dictionary<Texture2D, MeshWrapper> meshes = new();
+		readonly Dictionary<Texture2D, List<Vector3>> verts = new();
+		readonly Dictionary<Texture2D, List<Vector2>> uvs = new();
+		readonly Dictionary<Texture2D, List<int>> tris = new();
 		void UpdateMeshes() {
 			if (meshes.Count == 0) return;
 			sum_x = 0;
@@ -117,8 +116,7 @@ namespace Cryville.Crtr.Skin.Components {
 				tris[key].Clear();
 			}
 			foreach (var c in m_value) {
-				SpriteInfo f;
-				if (!m_frames.TryGetValue(c, out f)) {
+				if (!m_frames.TryGetValue(c, out SpriteInfo f)) {
 					Game.MainLogger.Log(3, "Skin", "Could not render the character '{0}' in the string \"{1}\" on the text component because no image is assigned to that character.", c, m_value);
 					continue;
 				}
@@ -173,7 +171,7 @@ namespace Cryville.Crtr.Skin.Components {
 			UpdateFrames();
 			mesh.Mesh.Clear();
 			UpdateScale();
-			Value.OnUpdate += UpdateScale;
+			Value.Updated += UpdateScale;
 		}
 	}
 }

Assets/Cryville/Crtr/Skin/Components/TrackLine.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 
 namespace Cryville.Crtr.Skin.Components {
 	public class TrackLine : SectionalGameObject {
-		readonly List<Vector3> vertices = new List<Vector3>();
+		readonly List<Vector3> vertices = new();
 
 		LineRenderer lineRenderer;
 

Assets/Cryville/Crtr/Skin/EffectGroup.cs

@@ -8,7 +8,7 @@ namespace Cryville.Crtr.Skin {
 		readonly EffectPool _pool;
 		class EffectPool : ObjectPool<EffectInstance> {
 			readonly List<EffectInstance> _instances
-				= new List<EffectInstance>();
+				= new();
 			readonly EffectGroup _group;
 			public EffectPool(EffectGroup group) : base(256) {
 				_group = group;
@@ -23,9 +23,9 @@ namespace Cryville.Crtr.Skin {
 			}
 		}
 		readonly Dictionary<float, EffectInstance> _instances
-			= new Dictionary<float, EffectInstance>();
+			= new();
 		readonly List<EffectInstance> _endQueue
-			= new List<EffectInstance>();
+			= new();
 		public EffectGroup(EffectDefinition def) {
 			Definition = def;
 			_pool = new EffectPool(this);
@@ -51,8 +51,7 @@ namespace Cryville.Crtr.Skin {
 			}
 		}
 		public void Emit(float index, Transform target = null) {
-			EffectInstance instance;
-			bool flag = _instances.TryGetValue(index, out instance);
+			bool flag = _instances.TryGetValue(index, out EffectInstance instance);
 			if (!flag) _instances.Add(index, instance = _pool.Rent());
 			instance.Index = index;
 			if (instance.CanEmit()) {

Assets/Cryville/Crtr/Skin/EffectInstance.cs

@@ -33,7 +33,7 @@ namespace Cryville.Crtr.Skin {
 		ChartEvent _ctxev;
 		ContainerState _ctxstate;
 		internal static readonly int _VAR_EFFECT_INDEX = IdentifierManager.Shared.Request("effect_index");
-		readonly PropStores.Float _indexst = new PropStores.Float();
+		readonly PropStores.Float _indexst = new();
 		public float Index {
 			get { return _indexst.Value; }
 			set { _indexst.Value = value; }

Assets/Cryville/Crtr/Skin/EffectManager.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 namespace Cryville.Crtr.Skin {
 	public class EffectManager {
 		readonly IntKeyedDictionary<EffectGroup> _groups
-			= new IntKeyedDictionary<EffectGroup>();
+			= new();
 		public EffectManager(PdtSkin skin) {
 			foreach (var e in skin.effects) {
 				_groups.Add(e.Key.Key, new EffectGroup(e.Value));
@@ -22,8 +22,7 @@ namespace Cryville.Crtr.Skin {
 			GetGroup(id).Emit(index, target);
 		}
 		EffectGroup GetGroup(int id) {
-			EffectGroup result;
-			if (_groups.TryGetValue(id, out result)) return result;
+			if (_groups.TryGetValue(id, out EffectGroup result)) return result;
 			throw new ArgumentException(string.Format("The effect \"{0}\" is not found", IdentifierManager.Shared.Retrieve(id)));
 		}
 		public void Dispose() {

Assets/Cryville/Crtr/Skin/SkinContainer.cs

@@ -9,12 +9,12 @@ namespace Cryville.Crtr.Skin {
 		readonly ISkinnableGroup _group;
 		readonly SkinElement _rootElement;
 		readonly DynamicStack[] _stacks = new DynamicStack[3];
-		readonly HashSet<SkinPropertyKey> _once = new HashSet<SkinPropertyKey>();
-		public readonly IntKeyedDictionary<PropStores.Float> Variables = new IntKeyedDictionary<PropStores.Float>();
+		readonly HashSet<SkinPropertyKey> _once = new();
+		public readonly IntKeyedDictionary<PropStores.Float> Variables = new();
 
 		class DynamicStack {
-			public readonly List<DynamicProperty> Properties = new List<DynamicProperty>();
-			public readonly List<DynamicElement> Elements = new List<DynamicElement>();
+			public readonly List<DynamicProperty> Properties = new();
+			public readonly List<DynamicElement> Elements = new();
 			public void Clear() {
 				Properties.Clear();
 				Elements.Clear();
@@ -78,7 +78,7 @@ namespace Cryville.Crtr.Skin {
 			var stack = _stacks[dl];
 			if (stack.Properties.Count == 0 && stack.Elements.Count == 0) return;
 			var nstack = dl + 1 < _stacks.Length ? _stacks[dl + 1] : null;
-			if (nstack != null) nstack.Clear();
+			nstack?.Clear();
 			Profiler.BeginSample("SkinContainer.MatchDynamic");
 			if (!recursive) PdtEvaluator.Instance.ContextSkinContainer = this;
 			for (int i = 0; i < stack.Properties.Count; i++) {
@@ -150,7 +150,7 @@ namespace Cryville.Crtr.Skin {
 			}
 			if (rc.PropSrcs != null) PdtEvaluator.Instance.ContextCascadeDiscard();
 		}
-		readonly PropStores.Float _rtimest = new PropStores.Float(); 
+		readonly PropStores.Float _rtimest = new(); 
 		public void MatchAnimation(AnimationSpan span, float rtime, RuntimeSkinContext ctx) {
 			PdtEvaluator.Instance.ContextSkinContainer = this;
 			PdtEvaluator.Instance.ContextSelfValue = _rtimest.Source;

Assets/Cryville/Crtr/Skin/SkinDefinition.cs

@@ -20,37 +20,35 @@ namespace Cryville.Crtr.Skin {
 		[JsonRequired]
 		public string ruleset;
 
-		public List<string> frames = new List<string>();
+		public List<string> frames = new();
 
 		[JsonIgnore]
 		public PdtSkin Root { get; private set; }
 
 		public void LoadPdt(DirectoryInfo dir) {
-			using (StreamReader pdtreader = new StreamReader(Path.Combine(dir.FullName, data + ".pdt"), Encoding.UTF8)) {
-				var src = pdtreader.ReadToEnd();
-				var interpreter = new SkinInterpreter(src, null);
-				var format = interpreter.GetFormatVersion();
-				if (format.Length == 1) {
-					Root = new PdtSkin();
-					Root.elements = (SkinElement)new SkinInterpreter(src, new PdtBinder()).Interpret(typeof(SkinElement));
-				}
-				else {
-					switch (format[1]) {
-						case 1:
-							Root = (PdtSkin)new SkinInterpreter(src, new PdtBinder()).Interpret(typeof(PdtSkin));
-							break;
-						default: throw new NotSupportedException("Unsupported skin format");
-					}
-				}
+			using StreamReader pdtreader = new(Path.Combine(dir.FullName, data + ".pdt"), Encoding.UTF8);
+			var src = pdtreader.ReadToEnd();
+			var interpreter = new SkinInterpreter(src, null);
+			var format = interpreter.GetFormatVersion();
+			if (format.Length == 1) {
+				Root = new PdtSkin {
+					elements = (SkinElement)new SkinInterpreter(src, new PdtBinder()).Interpret(typeof(SkinElement))
+				};
+			}
+			else {
+				Root = format[1] switch {
+					1 => (PdtSkin)new SkinInterpreter(src, new PdtBinder()).Interpret(typeof(PdtSkin)),
+					_ => throw new NotSupportedException("Unsupported skin format"),
+				};
 			}
 		}
 	}
 
 	public class PdtSkin {
 		public Dictionary<Identifier, AnimationSpan> animations
-			= new Dictionary<Identifier, AnimationSpan>();
+			= new();
 		public Dictionary<Identifier, EffectDefinition> effects
-			= new Dictionary<Identifier, EffectDefinition>();
+			= new();
 		public SkinElement elements;
 
 		public void Optimize(PdtEvaluator etor) {
@@ -74,11 +72,11 @@ namespace Cryville.Crtr.Skin {
 	public class SkinElement {
 		[ElementList]
 		public PairList<SkinSelectors, SkinElement> elements
-			= new PairList<SkinSelectors, SkinElement>();
+			= new();
 
 		[PropertyList]
 		public PairList<SkinPropertyKey, PdtExpression> properties
-			= new PairList<SkinPropertyKey, PdtExpression>();
+			= new();
 
 		public bool IsDynamic {
 			get;
@@ -102,19 +100,18 @@ namespace Cryville.Crtr.Skin {
 	}
 
 	public class EffectDefinition {
-		static readonly Identifier _ident_init = new Identifier("<init>");
+		static readonly Identifier _ident_init = new("<init>");
 #pragma warning disable IDE1006
 		public PdtExpression duration {
 			set {
-				EffectState s;
-				if (!states.TryGetValue(_ident_init, out s))
+				if (!states.TryGetValue(_ident_init, out EffectState s))
 					throw new InvalidOperationException("Cannot set duration and states at the same time");
 				s.duration = value;
 			}
 		}
 #pragma warning restore IDE1006
 		public Identifier init = _ident_init;
-		public Dictionary<Identifier, EffectState> states = new Dictionary<Identifier, EffectState> {
+		public Dictionary<Identifier, EffectState> states = new() {
 			{ _ident_init, new EffectState() { rewind = _ident_init } }
 		};
 		public SkinElement elements;
@@ -129,11 +126,11 @@ namespace Cryville.Crtr.Skin {
 	public class AnimationSpan {
 		[ElementList]
 		public PairList<Clip, AnimationSpan> spans
-			= new PairList<Clip, AnimationSpan>();
+			= new();
 
 		[PropertyList]
 		public PairList<SkinPropertyKey, PdtExpression> properties
-			= new PairList<SkinPropertyKey, PdtExpression>();
+			= new();
 
 		public void Optimize(PdtEvaluator etor) {
 			foreach (var p in properties) {

Assets/Cryville/Crtr/Skin/SkinInterpreter.cs

@@ -7,9 +7,9 @@ namespace Cryville.Crtr.Skin {
 	public class SkinInterpreter : PdtInterpreter {
 		public SkinInterpreter(string src, Binder binder) : base(src, binder) { }
 
-		readonly List<SkinSelector> s = new List<SkinSelector>();
-		readonly HashSet<string> a = new HashSet<string>();
-		readonly List<string> k = new List<string>(2);
+		readonly List<SkinSelector> s = new();
+		readonly HashSet<string> a = new();
+		readonly List<string> k = new(2);
 		protected override object InterpretKey(Type type) {
 			if (typeof(SkinElement).IsAssignableFrom(type))
 				return InterpretSkinElementKey();

Assets/Cryville/Crtr/Skin/SkinPropertyKey.cs

@@ -40,8 +40,7 @@ namespace Cryville.Crtr.Skin {
 					throw new FormatException("Unknown error");
 			}
 			static Type GetComponentByName(string name) {
-				Type result;
-				if (BuiltinResources.Components.TryGetValue(name, out result)) return result;
+				if (BuiltinResources.Components.TryGetValue(name, out Type result)) return result;
 				throw new ArgumentException(string.Format("Component type \"{0}\" not found", name));
 			}
 		}
@@ -102,8 +101,7 @@ namespace Cryville.Crtr.Skin {
 					"Trying to set property \"{0}\" but the component is not found",
 					IdentifierManager.Shared.Retrieve(Name)
 				));
-				SkinProperty result;
-				if (!comp.Properties.TryGetValue(Name, out result))
+				if (!comp.Properties.TryGetValue(Name, out SkinProperty result))
 					throw new InvalidOperationException(string.Format(
 						"Property \"{0}\" not found on component",
 						IdentifierManager.Shared.Retrieve(Name)
@@ -186,15 +184,13 @@ namespace Cryville.Crtr.Skin {
 			}
 			public override bool IsValueRequired { get { return true; } }
 			public override void ExecuteStatic(ISkinnableGroup group, RuntimeSkinContext ctx, PdtExpression exp, IntKeyedDictionary<PropStores.Float> vars) {
-				PropStores.Float v;
-				if (!vars.TryGetValue(Name, out v))
+				if (!vars.TryGetValue(Name, out PropStores.Float v))
 					vars.Add(Name, v = new PropStores.Float());
 				if (!PdtEvaluator.Instance.Evaluate(v.Target, exp))
 					throw new EvaluationFailureException();
 			}
 			public override void ExecuteDynamic(ISkinnableGroup group, RuntimeSkinContext ctx, PdtExpression exp, IntKeyedDictionary<PropStores.Float> vars, int dl) {
-				PropStores.Float v;
-				if (!vars.TryGetValue(Name, out v))
+				if (!vars.TryGetValue(Name, out PropStores.Float v))
 					throw new InvalidOperationException(string.Format("Variable \"{0}\" not defined", IdentifierManager.Shared.Retrieve(Name)));
 				if (!PdtEvaluator.Instance.Evaluate(v.Target, exp))
 					throw new EvaluationFailureException();

Assets/Cryville/Crtr/Skin/SkinSelectors.cs

@@ -75,7 +75,7 @@ namespace Cryville.Crtr.Skin {
 				var obj = new GameObject("__obj__");
 				obj.transform.SetParent(c.Transform, false);
 				obj.AddComponent<TransformInterface>();
-				return new SkinContext[] { new SkinContext(obj.transform) };
+				return new SkinContext[] { new(obj.transform) };
 			}
 		}
 		public class Anchor : SkinSelector {
@@ -86,8 +86,7 @@ namespace Cryville.Crtr.Skin {
 			public override string ToString() { return string.Format(".{0}", IdentifierManager.Shared.Retrieve(Name)); }
 
 			public override IEnumerable<SkinContext> MatchStatic(ISkinnableGroup g, SkinContext c) {
-				IReadOnlyCollection<CAnchor> anchors;
-				if (g.TryGetAnchorsByName(Name, out anchors)) {
+				if (g.TryGetAnchorsByName(Name, out IReadOnlyCollection<CAnchor> anchors)) {
 					return anchors.Select(a => a.SkinContext);
 				}
 				else return Enumerable.Empty<SkinContext>();

Assets/Cryville/Crtr/SpriteFrame.cs

@@ -28,16 +28,16 @@ namespace Cryville.Crtr {
 				float y0 = Mathf.Min(_uv.yMin, _uv.yMax);
 				float y1 = Mathf.Max(_uv.yMin, _uv.yMax);
 				if (m_rotated) cuv = new Vector2[]{
-						new Vector2(x0, y1),
-						new Vector2(x1, y0),
-						new Vector2(x0, y0),
-						new Vector2(x1, y1),
+						new(x0, y1),
+						new(x1, y0),
+						new(x0, y0),
+						new(x1, y1),
 					};
 				else cuv = new Vector2[]{
-						new Vector2(x0, y0),
-						new Vector2(x1, y1),
-						new Vector2(x1, y0),
-						new Vector2(x0, y1),
+						new(x0, y0),
+						new(x1, y1),
+						new(x1, y0),
+						new(x0, y1),
 					};
 			}
 		}

Assets/Cryville/Crtr/UI/Dialog.cs

@@ -14,7 +14,7 @@ namespace Cryville.Crtr.UI {
 		[SerializeField] TextMeshProUGUI m_button1Text;
 		[SerializeField] GameObject m_button1;
 		float _fadeDuration;
-		static readonly Queue<DialogEntry> _queue = new Queue<DialogEntry>();
+		static readonly Queue<DialogEntry> _queue = new();
 		struct DialogEntry {
 			public Action<int> callback;
 			public string message;
@@ -57,8 +57,7 @@ namespace Cryville.Crtr.UI {
 		}
 		public void OnButton(int id) {
 			if (_cur == null) return;
-			var cb = _cur.Value.callback;
-			if (cb != null) cb(id);
+			_cur.Value.callback?.Invoke(id);
 			_cur = null;
 		}
 		public static void Suppress() {
@@ -75,15 +74,14 @@ namespace Cryville.Crtr.UI {
 			_queue.Enqueue(new DialogEntry { callback = callback, message = message, action0 = action0, action1 = action1 });
 		}
 		public static int ShowAndWait(string message, string action0 = "OK", string action1 = null) {
-			using (var ev = new AutoResetEvent(false)) {
-				int result = 0;
-				_queue.Enqueue(new DialogEntry {
-					callback = r => { result = r; ev.Set(); },
-					message = message, action0 = action0, action1 = action1,
-				});
-				ev.WaitOne();
-				return result;
-			}
+			using var ev = new AutoResetEvent(false);
+			int result = 0;
+			_queue.Enqueue(new DialogEntry {
+				callback = r => { result = r; ev.Set(); },
+				message = message, action0 = action0, action1 = action1,
+			});
+			ev.WaitOne();
+			return result;
 		}
 	}
 }