File Scoped Namespace Declarations (#716)

* refactor: file-scoped namespace OpenTaiko

* refactor: file-scoped namespace FDK

* refactor: dotnet format

FDK/src/00.Common/CActivity.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public class CActivity {
 	// Properties
 
@@ -148,4 +149,3 @@
 	//-----------------
 	#endregion
 }
-}

FDK/src/00.Common/CConversion.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public class CConversion {
 	// Properties
 
@@ -234,4 +235,3 @@
 	//-----------------
 	#endregion
 }
-}

FDK/src/00.Common/CCounter.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// 一定間隔で単純増加する整数（カウント値）を扱う。
 /// </summary>
@@ -268,4 +269,3 @@
 	//-----------------
 	#endregion
 }
-}

FDK/src/00.Common/CFPS.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public class CFPS {
 	// Properties
 
@@ -58,4 +59,3 @@
 	//-----------------
 	#endregion
 }
-}

FDK/src/00.Common/CIniFile.cs

@@ -1,10 +1,10 @@
 using System.Text;
 
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// 汎用的な .iniファイルを扱う。
 /// </summary>
-
 public class CIniFile {
 	// Properties
 
@@ -109,4 +109,3 @@ namespace FDK {
 		}
 	}
 }
-}

FDK/src/00.Common/CIntervalProcessing.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// <para>一定の間隔で処理を行うテンプレートパターンの定義。</para>
 /// <para>たとえば、t進行() で 5ms ごとに行う処理を前回のt進行()の呼び出しから 15ms 後に呼び出した場合は、処理が 3回 実行される。</para>
@@ -49,4 +50,3 @@
 	//-----------------
 	#endregion
 }
-}

FDK/src/00.Common/CJudgeTextEncoding.cs

@@ -1,7 +1,8 @@
 using System.Diagnostics;
 using System.Text;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 public class CJudgeTextEncoding {
 	/// <summary>
 	/// Hnc8様のReadJEncを使用して文字コードの判別をする。
@@ -66,4 +67,3 @@ namespace OpenTaiko {
 	}
 
 }
-}

FDK/src/00.Common/CTimer.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public class CTimer : CTimerBase {
 	public enum TimerType {
 		Unknown = -1,
@@ -153,4 +154,3 @@
 	//-----------------
 	#endregion
 }
-}

FDK/src/00.Common/CTimerBase.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// <para>タイマの抽象クラス。</para>
 /// <para>このクラスを継承し、override したクラスを作成することで、任意のクロックを持つタイマを作成できる。</para>
@@ -141,4 +142,3 @@
 	//-----------------
 	#endregion
 }
-}

FDK/src/00.Common/CTraceLogListener.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
 
-namespace FDK {
+namespace FDK;
+
 public class CTraceLogListener : TraceListener {
 	public CTraceLogListener(StreamWriter stream) {
 		this.LogStreamWriter = stream;
@@ -106,4 +107,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/00.Common/CUtility.cs

@@ -1,7 +1,8 @@
 using System.Diagnostics;
 using System.Text;
 
-namespace FDK {
+namespace FDK;
+
 public class CUtility {
 
 	public static void RunCompleteGC() {
@@ -106,4 +107,3 @@ namespace FDK {
 		return true;
 	}
 }
-}

FDK/src/00.Common/Color4.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public class Color4 {
 	public float Red;
 	public float Green;
@@ -19,4 +20,3 @@
 		Red = (rgba & 255) / 255.0f;
 	}
 }
-}

FDK/src/00.Common/ExtensionMethods/DoubleExtensions.cs

@@ -1,7 +1,7 @@
-namespace FDK.ExtensionMethods {
+namespace FDK.ExtensionMethods;
+
 public static class DoubleExtensions {
 	public static double Clamp(this double value, double min, double max) {
 		return Math.Min(Math.Max(value, min), max);
 	}
 }
-}

FDK/src/00.Common/ExtensionMethods/Int32Extensions.cs

@@ -1,7 +1,7 @@
-namespace FDK.ExtensionMethods {
+namespace FDK.ExtensionMethods;
+
 public static class Int32Extensions {
 	public static int Clamp(this int value, int min, int max) {
 		return Math.Min(Math.Max(value, min), max);
 	}
 }
-}

FDK/src/01.Framework/Core/Game.cs

@@ -32,7 +32,8 @@ using Silk.NET.OpenGLES.Extensions.ImGui;
 using Silk.NET.Windowing;
 using SkiaSharp;
 
-namespace SampleFramework {
+namespace SampleFramework;
+
 /// <summary>
 /// Presents an easy to use wrapper for making games and samples.
 /// </summary>
@@ -77,8 +78,7 @@ namespace SampleFramework {
 					ImGuiIO.Fonts.SetTexID((nint)ImGuiFontAtlas.Pointer);
 				}
 			}
-			}
+		} catch (Exception ex) {
-			catch (Exception ex) {
 			ImGuiIO.Fonts.Clear();
 			ImGuiIO.Fonts.AddFontDefault();
 		}
@@ -484,4 +484,3 @@ namespace SampleFramework {
 
 	public void Window_FramebufferResize(Vector2D<int> size) { }
 }
-}

FDK/src/01.Framework/Core/GameWindowSize.cs

@@ -1,6 +1,6 @@
-namespace SampleFramework {
+namespace SampleFramework;
+
 public static class GameWindowSize {
 	public static int Width = 1280;
 	public static int Height = 720;
 }
-}

FDK/src/01.Framework/Rendering/Angle/Egl.cs

@@ -30,7 +30,8 @@ using System.Runtime.InteropServices;
 
 #pragma warning disable 1591 // Missing XML comments
 
-namespace OpenTK.Graphics.Egl {
+namespace OpenTK.Graphics.Egl;
+
 using EGLClientBuffer = IntPtr;
 using EGLConfig = IntPtr;
 using EGLContext = IntPtr;
@@ -402,4 +403,3 @@ namespace OpenTK.Graphics.Egl {
 		}
 	}
 }
-}

FDK/src/02.Input/CInputGamepad.cs

@@ -1,6 +1,7 @@
 using Silk.NET.Input;
 
-namespace FDK {
+namespace FDK;
+
 public class CInputGamepad : IInputDevice, IDisposable {
 	// Constructor
 
@@ -143,4 +144,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/02.Input/CInputJoystick.cs

@@ -1,6 +1,7 @@
 using Silk.NET.Input;
 
-namespace FDK {
+namespace FDK;
+
 public class CInputJoystick : IInputDevice, IDisposable {
 	// Constructor
 
@@ -151,4 +152,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/02.Input/CInputKeyboard.cs

@@ -1,6 +1,7 @@
 using Silk.NET.Input;
 
-namespace FDK {
+namespace FDK;
+
 public class CInputKeyboard : IInputDevice, IDisposable {
 	// Constructor
 
@@ -141,4 +142,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/02.Input/CInputMIDI.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public class CInputMIDI : IInputDevice, IDisposable {
 	// Properties
 
@@ -106,4 +107,3 @@
 	//-----------------
 	#endregion
 }
-}

FDK/src/02.Input/CInputManager.cs

@@ -2,7 +2,8 @@
 using Silk.NET.Input;
 using Silk.NET.Windowing;
 
-namespace FDK {
+namespace FDK;
+
 public class CInputManager : IDisposable {
 	// 定数
 
@@ -197,4 +198,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/02.Input/CInputMouse.cs

@@ -2,7 +2,8 @@
 using System.Numerics;
 using Silk.NET.Input;
 
-namespace FDK {
+namespace FDK;
+
 public class CInputMouse : IInputDevice, IDisposable {
 	// 定数
 
@@ -136,4 +137,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/02.Input/DeviceConstantConverter.cs

@@ -2,7 +2,8 @@
 
 using SlimDXKey = SlimDXKeys.Key;
 
-namespace FDK {
+namespace FDK;
+
 public static class DeviceConstantConverter {
 	// メソッド
 
@@ -170,4 +171,3 @@ namespace FDK {
 		*/
 	};
 }
-}

FDK/src/02.Input/IInputDevice.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public interface IInputDevice : IDisposable {
 	// Properties
 
@@ -31,4 +32,3 @@
 	bool KeyReleasing(int nKey);
 	bool KeyReleasing(List<int> nKey) { return nKey.Any(key => KeyReleasing(key)); }
 }
-}

FDK/src/02.Input/InputDeviceType.cs

@@ -1,4 +1,4 @@
-namespace FDK {
+namespace FDK;
 // 定数
 
 public enum InputDeviceType {
@@ -9,4 +9,3 @@
 	MidiIn,
 	Unknown
 }
-}

FDK/src/02.Input/STInputEvent.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace FDK {
+namespace FDK;
 // 構造体
 
 [StructLayout(LayoutKind.Sequential)]
@@ -11,4 +11,3 @@ namespace FDK {
 	public long nTimeStamp { get; set; }
 	public int nVelocity { get; set; }
 }
-}

FDK/src/02.Input/SlimDXKeys.cs

@@ -1,4 +1,5 @@
-namespace SlimDXKeys {
+namespace SlimDXKeys;
+
 public enum Key {
 	D0 = 0,
 	D1 = 1,
@@ -159,4 +160,3 @@
 	YAxis = 9,
 	ZAxis = 10
 }
-}

FDK/src/03.Sound/CSound.cs

@@ -8,7 +8,7 @@ using ManagedBass.Fx;
 using ManagedBass.Mix;
 
 
-namespace FDK {
+namespace FDK;
 // CSound は、サウンドデバイスが変更されたときも、インスタンスを再作成することなく、新しいデバイスで作り直せる必要がある。
 // そのため、デバイスごとに別のクラスに分割するのではなく、１つのクラスに集約するものとする。
 
@@ -739,4 +739,3 @@ namespace FDK {
 
 	#endregion
 }
-}

FDK/src/03.Sound/CSoundDeviceASIO.cs

@@ -3,7 +3,8 @@ using ManagedBass;
 using ManagedBass.Asio;
 using ManagedBass.Mix;
 
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// 全ASIOデバイスを列挙する静的クラス。
 /// BASS_Init()やBASS_ASIO_Init()の状態とは無関係に使用可能。
@@ -378,4 +379,3 @@ namespace FDK {
 	private long n累積転送バイト数 = 0;
 	private bool bIsBASSFree = true;
 }
-}

FDK/src/03.Sound/CSoundDeviceBASS.cs

@@ -2,7 +2,8 @@
 using ManagedBass;
 using ManagedBass.Mix;
 
-namespace FDK {
+namespace FDK;
+
 public class CSoundDeviceBASS : ISoundDevice {
 	// Properties
 
@@ -222,4 +223,3 @@ namespace FDK {
 
 	//WASAPIとASIOはLinuxでは使えないので、ここだけで良し
 }
-}

FDK/src/03.Sound/CSoundDeviceWASAPI.cs

@@ -3,7 +3,8 @@ using ManagedBass;
 using ManagedBass.Mix;
 using ManagedBass.Wasapi;
 
-namespace FDK {
+namespace FDK;
+
 internal class CSoundDeviceWASAPI : ISoundDevice {
 	// Properties
 
@@ -425,4 +426,3 @@ namespace FDK {
 	private bool b最初の実出力遅延算出 = true;
 	private bool bIsBASSFree = true;
 }
-}

FDK/src/03.Sound/CSoundTimer.cs

@@ -1,6 +1,7 @@
 using System.Diagnostics;
 
-namespace FDK {
+namespace FDK;
+
 public class CSoundTimer : CTimerBase {
 	public override long SystemTimeMs {
 		get {
@@ -100,4 +101,3 @@ namespace FDK {
 
 	private CTimer ct = null;                               // TESTCODE
 }
-}

FDK/src/03.Sound/ESoundDeviceType.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public enum ESoundDeviceType {
 	Bass,
 	ExclusiveWASAPI,
@@ -6,4 +7,3 @@
 	ASIO,
 	Unknown,
 }
-}

FDK/src/03.Sound/ESoundGroup.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 public enum ESoundGroup {
 	SoundEffect = 1,
 	Voice = 2,
@@ -6,4 +7,3 @@
 	SongPlayback = 4,
 	Unknown = 0
 }
-}

FDK/src/03.Sound/ExtensionMethods/BassMixExtensions.cs

@@ -1,7 +1,8 @@
 using ManagedBass;
 using ManagedBass.Mix;
 
-namespace FDK.BassMixExtension {
+namespace FDK.BassMixExtension;
+
 public static class BassMixExtensions {
 	public static bool ChannelPlay(int hHandle) {
 		return BassMix.ChannelRemoveFlag(hHandle, BassFlags.MixerChanPause);
@@ -15,4 +16,3 @@ namespace FDK.BassMixExtension {
 		return !BassMix.ChannelHasFlag(hHandle, BassFlags.MixerChanPause);
 	}
 }
-}

FDK/src/03.Sound/ISoundDevice.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 internal interface ISoundDevice : IDisposable {
 	ESoundDeviceType SoundDeviceType { get; }
 	int nMasterVolume { get; set; }
@@ -11,4 +12,3 @@
 	CSound tCreateSound(string strファイル名, ESoundGroup soundGroup);
 	void tCreateSound(string strファイル名, CSound sound);
 }
-}

FDK/src/03.Sound/LoudnessMetadata.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// The LoudnessMetadata structure is used to carry, and assist with
 /// calculations related to, integrated loudness and true peak
@@ -14,4 +15,3 @@
 		TruePeak = truePeak;
 	}
 }
-}

FDK/src/03.Sound/LoudnessMetadataScanner.cs

@@ -2,7 +2,8 @@
 using System.Diagnostics;
 using System.Xml.XPath;
 
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// The LoudnessMetadataScanner plays two roles:
 /// 1. Scanning of song audio files using BS1770GAIN (http://bs1770gain.sourceforge.net/)
@@ -293,4 +294,3 @@ namespace FDK {
 
 	public static event EventHandler<ScanningStateChangedEventArgs> ScanningStateChanged;
 }
-}

FDK/src/03.Sound/Lufs.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// The Lufs structure is used to carry, and assist with calculations related to,
 /// Loudness Units relative to Full Scale. LUFS are measured in absolute scale
@@ -34,4 +35,3 @@
 		return new Lufs(left._value + right._value);
 	}
 }
-}

FDK/src/03.Sound/SongGainController.cs

@@ -1,4 +1,5 @@
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// SongGainController provides a central place through which song preview
 /// and song playback attempt to apply BS1770GAIN-based loudness metadata
@@ -23,4 +24,3 @@
 		}
 	}
 }
-}

FDK/src/03.Sound/SoundGroupLevelController.cs

@@ -2,7 +2,8 @@
 using System.Collections.Specialized;
 using FDK.ExtensionMethods;
 
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// SoundGroupLevelController holds the current sound level value for each
 /// of the unique sound groups, along with an increment by which they can
@@ -110,4 +111,3 @@ namespace FDK {
 
 	public event EventHandler<LevelChangedEventArgs> LevelChanged;
 }
-}

FDK/src/03.Sound/SoundManager.cs

@@ -3,7 +3,8 @@ using ManagedBass;
 using Silk.NET.Windowing;
 
 
-namespace FDK {
+namespace FDK;
+
 public class SoundManager   // : CSound
 {
 	private static ISoundDevice SoundDevice {
@@ -378,4 +379,3 @@ namespace FDK {
 		cs.tRemoveSoundFromMixer();
 	}
 }
-}

FDK/src/04.Graphics/BitmapUtil.cs

@@ -1,7 +1,8 @@
 using System.Runtime.InteropServices;
 using SkiaSharp;
 
-namespace FDK {
+namespace FDK;
+
 public static class BitmapUtil {
 	// 定数
 
@@ -63,4 +64,3 @@ namespace FDK {
 		//return new SKBitmap( writer.BaseStream );
 	}
 }
-}

FDK/src/04.Graphics/CDecodedFrame.cs

@@ -2,7 +2,8 @@
 using System.Runtime.InteropServices;
 using FFmpeg.AutoGen;
 
-namespace FDK {
+namespace FDK;
+
 public class CDecodedFrame : IDisposable {
 	public CDecodedFrame(Size texsize) {
 		this.Using = false;
@@ -43,4 +44,3 @@ namespace FDK {
 		Marshal.FreeHGlobal(this.TexPointer);
 	}
 }
-}

FDK/src/04.Graphics/CFrameConverter.cs

@@ -3,7 +3,8 @@ using System.Runtime.InteropServices;
 using FFmpeg.AutoGen;
 
 
-namespace FDK {
+namespace FDK;
+
 public unsafe class CFrameConverter : IDisposable {
 	public CFrameConverter(Size FrameSize, AVPixelFormat pix_fmt) {
 		this.FrameSize = FrameSize;
@@ -60,4 +61,3 @@ namespace FDK {
 	private bool IsConvert = false;
 	private Size FrameSize;
 }
-}

FDK/src/04.Graphics/CTexture.cs

@@ -7,7 +7,8 @@ using Point = System.Drawing.Point;
 using Rectangle = System.Drawing.Rectangle;
 using RectangleF = System.Drawing.RectangleF;
 
-namespace FDK {
+namespace FDK;
+
 public class CTexture : IDisposable {
 	/// <summary>
 	/// バッファの集まり
@@ -944,4 +945,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/04.Graphics/CTextureAutofold.cs

@@ -1,6 +1,7 @@
 using Rectangle = System.Drawing.Rectangle;
 
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// 縦長_横長の画像を自動で折りたたんでテクスチャ化するCTexture。
 /// 例えば、768x30 のテクスチャファイルが入力されたら、
@@ -176,4 +177,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/04.Graphics/CTextureCreateFailedException.cs

@@ -1,6 +1,7 @@
 using System.Runtime.Serialization;
 
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// テクスチャの作成に失敗しました。
 /// </summary>
@@ -17,4 +18,3 @@ namespace FDK {
 		: base(message, innerException) {
 	}
 }
-}

FDK/src/04.Graphics/CVideoDecoder.cs

@@ -3,7 +3,8 @@ using System.Diagnostics;
 using FFmpeg.AutoGen;
 using Size = System.Drawing.Size;
 
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// ビデオのデコードをするクラス
 /// ファイル名・nullのCTextureをもらえれば、勝手に、CTextureに映像を格納して返す。
@@ -282,4 +283,3 @@ namespace FDK {
 	private CFrameConverter frameconv;
 	#endregion
 }
-}

FDK/src/04.Graphics/TextRenderer/CCachedFontRenderer.cs

@@ -3,7 +3,8 @@ using SkiaSharp;
 
 using Color = System.Drawing.Color;
 
-namespace FDK {
+namespace FDK;
+
 /// <summary>
 /// 高速描画版のCFontRendererクラス。
 /// といっても、一度レンダリングした結果をキャッシュして使いまわしているだけ。
@@ -237,4 +238,3 @@ namespace FDK {
 	//-----------------
 	#endregion
 }
-}

FDK/src/04.Graphics/TextRenderer/CFontRenderer.cs

@@ -5,7 +5,7 @@ using SkiaSharp;
 using static FDK.CSkiaSharpTextRenderer;
 using Color = System.Drawing.Color;
 
-namespace FDK {
+namespace FDK;
 
 public class CFontRenderer : IDisposable {
 	#region[static系]
@@ -259,4 +259,3 @@ namespace FDK {
 
 	private ITextRenderer textRenderer;
 }
-}

FDK/src/04.Graphics/TextRenderer/CSkiaSharpTextRenderer.cs

@@ -3,7 +3,8 @@ using System.Text.RegularExpressions;
 using SkiaSharp;
 using Color = System.Drawing.Color;
 
-namespace FDK {
+namespace FDK;
+
 internal class CSkiaSharpTextRenderer : ITextRenderer {
 	//https://monobook.org/wiki/SkiaSharp%E3%81%A7%E6%97%A5%E6%9C%AC%E8%AA%9E%E6%96%87%E5%AD%97%E5%88%97%E3%82%92%E6%8F%8F%E7%94%BB%E3%81%99%E3%82%8B
 	public CSkiaSharpTextRenderer(string fontpath, int pt) {
@@ -295,4 +296,3 @@ namespace FDK {
 
 	private SKPaint paint = null;
 }
-}

FDK/src/04.Graphics/TextRenderer/ITextRenderer.cs

@@ -2,7 +2,8 @@ using SkiaSharp;
 using static FDK.CSkiaSharpTextRenderer;
 using Color = System.Drawing.Color;
 
-namespace FDK {
+namespace FDK;
+
 internal interface ITextRenderer : IDisposable {
 	SKBitmap DrawText(string drawstr, CFontRenderer.DrawMode drawmode, Color fontColor, Color edgeColor, Color? secondEdgeColor, Color gradationTopColor, Color gradationBottomColor, int edge_Ratio, bool keepCenter);
 
@@ -10,4 +11,3 @@ namespace FDK {
 
 	List<SStringToken> Tokenize(string input, Color fontColor, Color edgeColor, Color? secondEdgeColor, Color gradationTopColor, Color gradationBottomColor);
 }
-}

OpenTaiko/src/Animations/Animator.cs

@@ -1,6 +1,7 @@
 using FDK;
 
-namespace OpenTaiko.Animations {
+namespace OpenTaiko.Animations;
+
 class Animator : IAnimatable {
 	public Animator(int startValue, int endValue, int tickInterval, bool isLoop) {
 		Type = CounterType.Normal;
@@ -93,4 +94,3 @@ namespace OpenTaiko.Animations {
 	Normal,
 	Double
 }
-}

OpenTaiko/src/Animations/EaseIn.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko.Animations {
+namespace OpenTaiko.Animations;
+
 /// <summary>
 /// A class that performs ease-in animation.
 /// </summary>
@@ -26,4 +27,3 @@
 	private readonly int Sa;
 	private readonly int TimeMs;
 }
-}

OpenTaiko/src/Animations/EaseInOut.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko.Animations {
+namespace OpenTaiko.Animations;
+
 /// <summary>
 /// A class that performs ease-in-out animation.
 /// </summary>
@@ -31,4 +32,3 @@
 	private readonly int Sa;
 	private readonly int TimeMs;
 }
-}

OpenTaiko/src/Animations/EaseOut.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko.Animations {
+namespace OpenTaiko.Animations;
+
 /// <summary>
 /// A class that performs ease-out animation.
 /// </summary>
@@ -27,4 +28,3 @@
 	private readonly int Sa;
 	private readonly int TimeMs;
 }
-}

OpenTaiko/src/Animations/FadeIn.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko.Animations {
+namespace OpenTaiko.Animations;
+
 /// <summary>
 /// A class that performs fade-in animation.
 /// </summary>
@@ -22,4 +23,3 @@
 
 	private readonly int TimeMs;
 }
-}

OpenTaiko/src/Animations/FadeOut.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko.Animations {
+namespace OpenTaiko.Animations;
+
 /// <summary>
 /// A class that performs fade-out animation.
 /// </summary>
@@ -22,4 +23,3 @@
 
 	private readonly int TimeMs;
 }
-}

OpenTaiko/src/Animations/IAnimatable.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko.Animations {
+namespace OpenTaiko.Animations;
+
 /// <summary>
 /// Animation interface.
 /// </summary>
@@ -25,4 +26,3 @@
 	/// <returns>Animation parameters.</returns>
 	object GetAnimation();
 }
-}

OpenTaiko/src/Animations/Linear.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko.Animations {
+namespace OpenTaiko.Animations;
+
 /// <summary>
 /// A class that performs linear animation.
 /// </summary>
@@ -26,4 +27,3 @@
 	private readonly int Sa;
 	private readonly int TimeMs;
 }
-}

OpenTaiko/src/Character/CMenuCharacter.cs

@@ -1,6 +1,7 @@
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class CMenuCharacter {
 	private static CCounter[] ctCharacterNormal = new CCounter[5] { new CCounter(), new CCounter(), new CCounter(), new CCounter(), new CCounter() };
 	private static CCounter[] ctCharacterSelect = new CCounter[5] { new CCounter(), new CCounter(), new CCounter(), new CCounter(), new CCounter() };
@@ -270,4 +271,3 @@ namespace OpenTaiko {
 		}
 	}
 }
-}

OpenTaiko/src/Character/CResultCharacter.cs

@@ -1,6 +1,7 @@
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class CResultCharacter {
 	private static CCounter[] ctCharacterNormal = new CCounter[5] { new CCounter(), new CCounter(), new CCounter(), new CCounter(), new CCounter() };
 	private static CCounter[] ctCharacterClear = new CCounter[5] { new CCounter(), new CCounter(), new CCounter(), new CCounter(), new CCounter() };
@@ -231,4 +232,3 @@ namespace OpenTaiko {
 		}
 	}
 }
-}

OpenTaiko/src/Character/PuchiChara.cs

@@ -2,7 +2,8 @@
 using Silk.NET.Maths;
 using Rectangle = System.Drawing.Rectangle;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class PuchiChara : CActivity {
 	public PuchiChara() {
 		base.IsDeActivated = true;
@@ -97,4 +98,3 @@ namespace OpenTaiko {
 	private CCounter SineCounterIdle;
 	private bool inGame;
 }
-}

OpenTaiko/src/Common/BestPlayRecords.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class BestPlayRecords {
 
 	public enum EClearStatus {
@@ -195,4 +196,3 @@
 		return stats;
 	}
 }
-}

OpenTaiko/src/Common/CConfigIni.cs

@@ -5,7 +5,8 @@ using System.Text;
 using FDK;
 using FDK.ExtensionMethods;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class CConfigIni : INotifyPropertyChanged {
 	private const int MinimumKeyboardSoundLevelIncrement = 1;
 	private const int MaximumKeyboardSoundLevelIncrement = 20;
@@ -3777,4 +3778,3 @@ TrainingJumpToLastMeasure=K051
 		PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 	}
 }
-}

OpenTaiko/src/Common/CConstants.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
 
 public enum Difficulty {
 	Easy,
@@ -405,4 +405,3 @@ namespace OpenTaiko {
 	Off = 0
 }
 #endregion
-}

OpenTaiko/src/Common/CCrypto.cs

@@ -1,7 +1,8 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class CCrypto {
 	internal static readonly char[] chars =
 		"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890".ToCharArray();
@@ -22,4 +23,3 @@ namespace OpenTaiko {
 		return result.ToString();
 	}
 }
-}

OpenTaiko/src/Common/CHitSounds.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class CHitSounds {
 	public CHitSounds(string path) {
 		tLoadFile(path);
@@ -52,4 +53,3 @@
 
 	#endregion
 }
-}

OpenTaiko/src/Common/CPad.cs

@@ -1,7 +1,8 @@
 using System.Runtime.InteropServices;
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 public class CPad {
 	// Properties
 
@@ -210,4 +211,3 @@ namespace OpenTaiko {
 	//-----------------
 	#endregion
 }
-}

OpenTaiko/src/Common/CSavableT.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class CSavableT<T> where T : new() {
 	public virtual string _fn {
 		get;
@@ -26,4 +27,3 @@
 	#endregion
 
 }
-}

OpenTaiko/src/Common/CSkin.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Text;
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
 // グローバル定数
 
 public enum Eシステムサウンド {
@@ -9311,4 +9311,3 @@ namespace OpenTaiko {
 
 	#endregion
 }
-}

OpenTaiko/src/Common/CSongDict.cs

@@ -1,6 +1,7 @@
 using System.Drawing;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class CSongDict {
 	private static Dictionary<string, CSongListNode> nodes = new Dictionary<string, CSongListNode>();
 	private static HashSet<string> urls = new HashSet<string>();
@@ -266,4 +267,3 @@ namespace OpenTaiko {
 
 	#endregion
 }
-}

OpenTaiko/src/Common/CTextConsole.cs

@@ -1,7 +1,8 @@
 using System.Drawing;
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class CTextConsole : CActivity {
 	public enum EFontType {
 		White,
@@ -92,4 +93,3 @@ namespace OpenTaiko {
 	//-----------------
 	#endregion
 }
-}

OpenTaiko/src/Common/ConfigIniToSongGainControllerBinder.cs

@@ -1,6 +1,7 @@
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 /// <summary>
 /// The ConfigIniToSongGainControllerBinder allows for SONGVOL and/or other
 /// properties related to the Gain levels applied to song preview and
@@ -30,4 +31,3 @@ namespace OpenTaiko {
 		};
 	}
 }
-}

OpenTaiko/src/Common/ConfigIniToSoundGroupLevelControllerBinder.cs

@@ -1,6 +1,7 @@
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 /// <summary>
 /// The ConfigIniToSoundGroupLevelControllerBinder allows for updated sound
 /// group level values, and keyboard sound level adjustment increment
@@ -56,4 +57,3 @@ namespace OpenTaiko {
 		};
 	}
 }
-}

OpenTaiko/src/Common/ConfigManager.cs

@@ -2,7 +2,8 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 /// <summary>
 /// Class for reading and writing configuration files.
 /// </summary>
@@ -45,4 +46,3 @@ namespace OpenTaiko {
 		}
 	}
 }
-}

OpenTaiko/src/Common/Easing.cs

@@ -1,6 +1,7 @@
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class Easing {
 	public int EaseIn(CCounter counter, float startPoint, float endPoint, CalcType type) {
 		StartPoint = startPoint;
@@ -185,4 +186,3 @@ namespace OpenTaiko {
 		Linear
 	}
 }
-}

OpenTaiko/src/Common/Favorites.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class Favorites {
 	public void tFavorites() {
 		if (!File.Exists("Favorite.json"))
@@ -43,5 +44,3 @@
 
 	#endregion
 }
-
-}

OpenTaiko/src/Common/ImGuiDebugWindow.cs

@@ -7,7 +7,8 @@ using FDK;
 using ImGuiNET;
 using SampleFramework;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 /*
  FOR DEBUGGING! This class is intended for developers only!
 */
@@ -550,4 +551,3 @@ namespace OpenTaiko {
 	#endregion
 
 }
-}

OpenTaiko/src/Common/KeyboardSoundGroupLevelControlHandler.cs

@@ -1,6 +1,7 @@
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 /// <summary>
 /// KeyboardSoundGroupLevelControlHandler is called by the song selection
 /// and song play stages when handling keyboard input. By delegating to
@@ -47,4 +48,3 @@ namespace OpenTaiko {
 		システムサウンド?.tPlay();
 	}
 }
-}

OpenTaiko/src/Common/LogNotification.cs

@@ -1,7 +1,8 @@
 using System.Diagnostics;
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class LogNotification {
 	private static Queue<CLogNotification> Notifications = new Queue<CLogNotification>();
 
@@ -49,4 +50,3 @@ namespace OpenTaiko {
 		// Add an optimized method to display the notifications here
 	}
 }
-}

OpenTaiko/src/Common/Modal.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class Modal {
 	public Modal(EModalType mt, int ra, params object?[] re) {
 		modalType = mt;
@@ -46,4 +47,3 @@
 	#endregion
 
 }
-}

OpenTaiko/src/Common/ModalQueue.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class ModalQueue {
 	public ModalQueue(Modal.EModalFormat mf) {
 		_modalQueues = new Queue<Modal>[] { new Queue<Modal>(), new Queue<Modal>(), new Queue<Modal>(), new Queue<Modal>(), new Queue<Modal>() };
@@ -41,4 +42,3 @@
 	private Modal.EModalFormat _modalFormat;
 	private Queue<Modal>[] _modalQueues;
 }
-}

OpenTaiko/src/Common/NamePlateConfig.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class NamePlateConfig {
 	public void tNamePlateConfig() {
 		// Deprecated, only converts to new format
@@ -208,4 +209,3 @@ namespace OpenTaiko {
 
 	#endregion
 }
-}

OpenTaiko/src/Common/OpenTaiko.cs

@@ -12,7 +12,8 @@ using Silk.NET.Maths;
 using SkiaSharp;
 using Rectangle = System.Drawing.Rectangle;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class OpenTaiko : Game {
 	// Properties
 	#region [ properties ]
@@ -2485,4 +2486,3 @@ for (int i = 0; i < 3; i++) {
 	public static Color4 borderColor = new Color4(1f, 0f, 0f, 0f);
 	#endregion
 }
-}

OpenTaiko/src/Common/Program.cs

@@ -3,7 +3,8 @@ using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class Program {
 	#region [ 二重起動チェック、DLL存在チェック ]
 	//-----------------------------
@@ -177,4 +178,3 @@ namespace OpenTaiko {
 		}
 	}
 }
-}

OpenTaiko/src/Common/RecentlyPlayedSongs.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class RecentlyPlayedSongs {
 	public void tRecentlyPlayedSongs() {
 		if (!File.Exists("RecentlyPlayedSongs.json"))
@@ -39,5 +40,3 @@
 
 	#endregion
 }
-
-}

OpenTaiko/src/Common/SaveFile.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class SaveFile {
 
 	public void tSaveFile(string filename) {
@@ -341,4 +342,3 @@ namespace OpenTaiko {
 
 	#endregion
 }
-}

OpenTaiko/src/Common/TitleTextureKey.cs

@@ -1,7 +1,7 @@
 using FDK;
 using Color = System.Drawing.Color;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
 
 public sealed class TitleTextureKey {
 
@@ -134,4 +134,3 @@ namespace OpenTaiko {
 		return !Equals(left, right);
 	}
 }
-}

OpenTaiko/src/Components/CGimmickValue.cs

@@ -1,4 +1,4 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class CGimmickValue {
 }
-}

OpenTaiko/src/Components/CLocalizationData.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 [Serializable]
 internal class CLocalizationData {
 	[JsonProperty("strings")]
@@ -23,4 +24,3 @@ namespace OpenTaiko {
 		Strings[langcode] = str;
 	}
 }
-}

OpenTaiko/src/Components/CSongReplay.cs

@@ -1,4 +1,5 @@
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class CSongReplay {
 	/* Game version used for the replay
 	 * 521 = 0.5.2.1
@@ -478,4 +479,3 @@
 
 	#endregion
 }
-}

OpenTaiko/src/Components/CVisualLogManager.cs

@@ -1,6 +1,7 @@
 using FDK;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class CVisualLogManager {
 	public enum ELogCardType {
 		LogInfo,
@@ -47,4 +48,3 @@ namespace OpenTaiko {
 
 	private List<LogCard> cards = new List<LogCard>();
 }
-}

OpenTaiko/src/Databases/DBCDN.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class DBCDN : CSavableT<Dictionary<string, DBCDN.CDNData>> {
 	public DBCDN() {
 		_fn = @$"{OpenTaiko.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}CDN.json";
@@ -53,4 +54,3 @@ namespace OpenTaiko {
 	#endregion
 
 }
-}

OpenTaiko/src/Databases/DBCharacter.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class DBCharacter {
 	public class CharacterEffect {
 		public CharacterEffect() {
@@ -89,4 +90,3 @@ namespace OpenTaiko {
 	}
 
 }
-}

OpenTaiko/src/Databases/DBEncyclopediaMenus.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class DBEncyclopediaMenus : CSavableT<DBEncyclopediaMenus.EncyclopediaMenu> {
 	public DBEncyclopediaMenus() {
 		_fn = @$"{OpenTaiko.strEXEのあるフォルダ}Encyclopedia{Path.DirectorySeparatorChar}Menus.json";
@@ -18,4 +19,3 @@ namespace OpenTaiko {
 
 	#endregion
 }
-}

OpenTaiko/src/Databases/DBNameplateUnlockables.cs

@@ -2,7 +2,8 @@
 using Newtonsoft.Json;
 using static OpenTaiko.DBNameplateUnlockables;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 internal class DBNameplateUnlockables : CSavableT<Dictionary<Int64, NameplateUnlockable>> {
 	public DBNameplateUnlockables() {
 		_fn = @$"{OpenTaiko.strEXEのあるフォルダ}Databases{Path.DirectorySeparatorChar}NameplateUnlockables.db3";
@@ -87,4 +88,3 @@ namespace OpenTaiko {
 			OpenTaiko.SaveFileInstances[player].tApplyHeyaChanges();
 	}
 }
-}

OpenTaiko/src/Databases/DBPuchichara.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 
-namespace OpenTaiko {
+namespace OpenTaiko;
+
 class DBPuchichara {
 	public class PuchicharaEffect {
 		public PuchicharaEffect() {
@@ -81,4 +82,3 @@ namespace OpenTaiko {
 	}
 
 }
-}