Merge pull request #32 from lulusuki/indev

CI workflow & linting

Author: lulusuki

.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: CI
+
+on:
+  pull_request:
+    types: [opened, reopened]
+  workflow_dispatch:
+
+jobs:
+  dotnet-format:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
+    - name: Setup
+      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9
+      with:
+        dotnet-version: 10.0.x
+
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Format
+      run: dotnet format --verify-no-changes Rhythia.csproj

scripts/Constants.cs

@@ -6,37 +6,37 @@ public partial class Constants : Node
 {
     public static readonly ulong STARTED = Time.GetTicksUsec();
 
-	public static readonly string ROOT_FOLDER = Directory.GetCurrentDirectory();
-	
-	public static readonly string USER_FOLDER = OS.GetUserDataDir();
+    public static readonly string ROOT_FOLDER = Directory.GetCurrentDirectory();
+
+    public static readonly string USER_FOLDER = OS.GetUserDataDir();
 
     public static readonly string DEFAULT_MAP_EXT = "phxm";
 
     public static readonly bool TEMP_MAP_MODE = false;//OS.GetCmdlineArgs().Length > 0;
 
-	public static readonly double CURSOR_SIZE = 0.2625;
+    public static readonly double CURSOR_SIZE = 0.2625;
 
-	public static readonly double GRID_SIZE = 3.0;
+    public static readonly double GRID_SIZE = 3.0;
 
-	public static readonly Vector2 BOUNDS = new((float)(GRID_SIZE / 2 - CURSOR_SIZE / 2), (float)(GRID_SIZE / 2 - CURSOR_SIZE / 2));
+    public static readonly Vector2 BOUNDS = new((float)(GRID_SIZE / 2 - CURSOR_SIZE / 2), (float)(GRID_SIZE / 2 - CURSOR_SIZE / 2));
 
-	public static readonly double HIT_BOX_SIZE = 0.07;
+    public static readonly double HIT_BOX_SIZE = 0.07;
 
-	public static readonly double HIT_WINDOW = 55;
+    public static readonly double HIT_WINDOW = 55;
 
-	public static readonly int BREAK_TIME = 4000;  // used for skipping breaks mid-map
+    public static readonly int BREAK_TIME = 4000;  // used for skipping breaks mid-map
 
-	public static readonly string[] DIFFICULTIES = ["N/A", "Easy", "Medium", "Hard", "Insane", "Illogical"];
+    public static readonly string[] DIFFICULTIES = ["N/A", "Easy", "Medium", "Hard", "Insane", "Illogical"];
 
-	public static readonly Color[] DIFFICULTY_COLORS = [Color.FromHtml("ffffff"), Color.FromHtml("77f379"), Color.FromHtml("fff832"), Color.FromHtml("e24479"), Color.FromHtml("9d6eff"), Color.FromHtml("0094fc")];
+    public static readonly Color[] DIFFICULTY_COLORS = [Color.FromHtml("ffffff"), Color.FromHtml("77f379"), Color.FromHtml("fff832"), Color.FromHtml("e24479"), Color.FromHtml("9d6eff"), Color.FromHtml("0094fc")];
 
-	public static readonly Godot.Collections.Dictionary<string, double> MODS_MULTIPLIER_INCREMENT = new()
-	{
-		["NoFail"] = 0,
-		["Ghost"] = 0.0675,
-		// ["Spin"] = 0.18,
-		// ["Flashlight"] = 0.1,
-		// ["Chaos"] = 0.07,
-		// ["HardRock"] = 0.08
-	};
+    public static readonly Godot.Collections.Dictionary<string, double> MODS_MULTIPLIER_INCREMENT = new()
+    {
+        ["NoFail"] = 0,
+        ["Ghost"] = 0.0675,
+        // ["Spin"] = 0.18,
+        // ["Flashlight"] = 0.1,
+        // ["Chaos"] = 0.07,
+        // ["HardRock"] = 0.08
+    };
 }

scripts/FileInitializer.cs

@@ -73,7 +73,7 @@ private void deepCopy(string resDir = "")
                     break;
                 case "ArrayMesh":
                     objExporter.Call("save_mesh_to_files", resource, userDir, resFile.Replace(".obj", ""));
-                        continue;
+                    continue;
                 default:
                     Logger.Error($"[{resFile}] {resource.GetType().Name} is not supported for the user folder.");
                     continue;

scripts/KeybindsManager.cs

@@ -11,7 +11,7 @@ public override void _Ready()
         wikiPopup = new("Open Wiki", string.Format(LinkPopupButton.InfoTemplate, wikiLink));
 
         wikiPopup.AddOption("Open", Callable.From(() => { OS.ShellOpen(wikiLink); }), wikiLink);
-		wikiPopup.AddOption("Cancel", Callable.From(wikiPopup.Hide));
+        wikiPopup.AddOption("Cancel", Callable.From(wikiPopup.Hide));
     }
 
     public override void _Input(InputEvent @event)

scripts/Rhythia.cs

@@ -75,7 +75,7 @@ public override async void _Ready()
 
         Stats.GamesOpened++;
 
-        
+
         // marking sspms for importing can be done with an one liner, kept the following block of code in case we need to loop over every valid map file for some reason
 
         // List<string> import = [];
@@ -94,14 +94,15 @@ public override async void _Ready()
 
         var nonPhxmMaps = Directory.EnumerateFiles($"{Constants.USER_FOLDER}/maps", $"*.*", SearchOption.AllDirectories).Where(f => f.GetExtension().ToLower() == "sspm" || f.GetExtension().ToLower() == "txt");
         await MapParser.BulkImport([.. nonPhxmMaps], notify: true);
-        
+
         // delete after importing
         foreach (string file in nonPhxmMaps)
         {
             File.Delete(file);
         }
 
-        GetViewport().Connect("files_dropped", Callable.From((string[] files) => {
+        GetViewport().Connect("files_dropped", Callable.From((string[] files) =>
+        {
             EmitSignal(SignalName.FilesDropped, files);
 
             List<string> maps = [];

scripts/SceneManager.cs

@@ -59,7 +59,8 @@ public static void Load(string path, bool skipTransition = false)
             outTween.TweenProperty(Scene.Transition, "self_modulate", Color.FromHtml("ffffffff"), skipTransition ? 0 : 0.25);
         }
 
-        outTween.TweenCallback(Callable.From(() => {
+        outTween.TweenCallback(Callable.From(() =>
+        {
             removeScene(Scene);
 
             activeScenePath = path;

scripts/SettingsManager.cs

@@ -87,7 +87,7 @@ public static void Load(string profile = null)
             ToastNotification.Notify($"Could not find skin {Instance.Settings.Skin.Value}", 1);
         }
 
-        void addUserContentToSettingsList(SettingsItem<string> settingsItem, IEnumerable<string> options)
+        static void addUserContentToSettingsList(SettingsItem<string> settingsItem, IEnumerable<string> options)
         {
             foreach (string option in options)
             {
@@ -143,7 +143,7 @@ public static void ResetToDefaults()
 
         SettingsProfile defaults = new SettingsProfile();
 
-        foreach(var property in typeof(SettingsProfile).GetProperties())
+        foreach (var property in typeof(SettingsProfile).GetProperties())
         {
             if (!typeof(ISettingsItem).IsAssignableFrom(property.PropertyType)) continue;
 

scripts/SoundManager.cs

@@ -66,7 +66,8 @@ public override void _Ready()
 
         SettingsManager.Instance.Loaded += UpdateVolume;
         Lobby.Instance.SpeedChanged += (speed) => { SoundManager.Song.PitchScale = (float)speed; };
-        MapManager.Selected.ValueChanged += (_, selected) => {
+        MapManager.Selected.ValueChanged += (_, selected) =>
+        {
             var map = selected.Value;
 
             if (Map == null || Map.Name != map.Name)

scripts/database/Config.cs

@@ -13,7 +13,7 @@ public class Config
     /// </summary>
     public string SettingsProfileID { get; set; }
 
-    private Config Default()
+    private Config init()
     {
         return new Config();
     }

scripts/database/settings/ISettingsItem.cs

@@ -28,5 +28,5 @@ public interface ISettingsItem
 
     bool Visible { get; }
 
-    bool SaveToDisk { get; }   
+    bool SaveToDisk { get; }
 }