Merge pull request #440 from drewhoener/v2-3-1

v2.3.1
Annosz · Mar 25, 2024 · e01bc49 · e01bc49
2 parents 57ce2ac + 4b9b618
commit e01bc49
Show file tree

Hide file tree

Showing 43 changed files with 5,424 additions and 5,519 deletions.
diff --git a/UIInfoSuite2/AdditionalFeatures/SkipIntro.cs b/UIInfoSuite2/AdditionalFeatures/SkipIntro.cs
@@ -4,34 +4,33 @@
 using StardewValley;
 using StardewValley.Menus;
 
-namespace UIInfoSuite2.AdditionalFeatures
+namespace UIInfoSuite2.AdditionalFeatures;
+
+public class SkipIntro
 {
-  public class SkipIntro
+  private readonly IModEvents _events;
+
+  public SkipIntro(IModEvents events)
   {
-    private readonly IModEvents _events;
+    _events = events;
 
-    public SkipIntro(IModEvents events)
-    {
-      _events = events;
+    events.Input.ButtonPressed += OnButtonPressed;
+    events.GameLoop.SaveLoaded += OnSaveLoaded;
+  }
 
-      events.Input.ButtonPressed += OnButtonPressed;
-      events.GameLoop.SaveLoaded += OnSaveLoaded;
-    }
+  private void OnSaveLoaded(object sender, EventArgs e)
+  {
+    _events.Input.ButtonPressed -= OnButtonPressed;
+    _events.GameLoop.SaveLoaded -= OnSaveLoaded;
+  }
 
-    private void OnSaveLoaded(object sender, EventArgs e)
+  private void OnButtonPressed(object sender, ButtonPressedEventArgs e)
+  {
+    if (Game1.activeClickableMenu is TitleMenu menu &&
+        (e.Button == SButton.Escape || e.Button == SButton.ControllerStart))
     {
+      menu.skipToTitleButtons();
       _events.Input.ButtonPressed -= OnButtonPressed;
-      _events.GameLoop.SaveLoaded -= OnSaveLoaded;
-    }
-
-    private void OnButtonPressed(object sender, ButtonPressedEventArgs e)
-    {
-      if (Game1.activeClickableMenu is TitleMenu menu &&
-          (e.Button == SButton.Escape || e.Button == SButton.ControllerStart))
-      {
-        menu.skipToTitleButtons();
-        _events.Input.ButtonPressed -= OnButtonPressed;
-      }
     }
   }
 }