fix: Add function to handle more complex "should show icon" behavior.

Annosz · Mar 20, 2024 · f5bee59 · f5bee59
1 parent 90b23c8
commit f5bee59
Show file tree

Hide file tree

Showing 12 changed files with 309 additions and 293 deletions.
diff --git a/UIInfoSuite2/UIElements/ExperienceBar.cs b/UIInfoSuite2/UIElements/ExperienceBar.cs
@@ -259,7 +259,7 @@ public void OnUpdateTicked_HandleTimers(object sender, UpdateTickedEventArgs e)
 
     private void OnRenderingHud(object sender, RenderingHudEventArgs e)
     {
-      if (Game1.eventUp)
+      if (!UIElementUtils.IsRenderingNormally())
       {
         return;
       }

diff --git a/UIInfoSuite2/UIElements/LuckOfDay.cs b/UIInfoSuite2/UIElements/LuckOfDay.cs
@@ -96,7 +96,7 @@ private void OnRenderedHud(object sender, RenderedHudEventArgs e)
     private void OnRenderingHud(object sender, RenderingHudEventArgs e)
     {
       // draw dice icon
-      if (!Game1.eventUp)
+      if (UIElementUtils.IsRenderingNormally())
       {
         Point iconPosition = IconHandler.Handler.GetNewIconPosition();
         ClickableTextureComponent icon = _icon.Value;

diff --git a/UIInfoSuite2/UIElements/ShowBirthdayIcon.cs b/UIInfoSuite2/UIElements/ShowBirthdayIcon.cs
@@ -80,7 +80,7 @@ private void OnDayStarted(object? sender, DayStartedEventArgs e)
 
     private void OnRenderingHud(object? sender, RenderingHudEventArgs e)
     {
-      if (!Game1.eventUp)
+      if (UIElementUtils.IsRenderingNormally())
       {
         DrawBirthdayIcon();
       }
@@ -89,7 +89,7 @@ private void OnRenderingHud(object? sender, RenderingHudEventArgs e)
 
     private void OnRenderedHud(object? sender, RenderedHudEventArgs e)
     {
-      if (!Game1.eventUp)
+      if (UIElementUtils.IsRenderingNormally())
       {
         DrawHoverText();
       }

diff --git a/UIInfoSuite2/UIElements/ShowItemEffectRanges.cs b/UIInfoSuite2/UIElements/ShowItemEffectRanges.cs
@@ -75,7 +75,7 @@ private void OnUpdateTicked(object? sender, UpdateTickedEventArgs e)
       }
     }
 
-    if (Game1.activeClickableMenu == null && !Game1.eventUp)
+    if (Game1.activeClickableMenu == null && UIElementUtils.IsRenderingNormally())
     {
       UpdateEffectiveArea();
     }

diff --git a/UIInfoSuite2/UIElements/ShowQueenOfSauceIcon.cs b/UIInfoSuite2/UIElements/ShowQueenOfSauceIcon.cs
@@ -90,7 +90,7 @@ private void OnUpdateTicked(object sender, UpdateTickedEventArgs e)
 
     private void OnRenderingHud(object sender, RenderingHudEventArgs e)
     {
-      if (!Game1.eventUp)
+      if (UIElementUtils.IsRenderingNormally())
       {
         if (_drawQueenOfSauceIcon.Value)
         {

diff --git a/UIInfoSuite2/UIElements/ShowRainyDayIcon.cs b/UIInfoSuite2/UIElements/ShowRainyDayIcon.cs
@@ -63,7 +63,7 @@ private void OnRenderingHud(object sender, RenderingHudEventArgs e)
     {
       GetWeatherIconSpriteLocation();
 
-      if (Game1.eventUp)
+      if (!UIElementUtils.IsRenderingNormally())
       {
         return;
       }

diff --git a/UIInfoSuite2/UIElements/ShowRobinBuildingStatusIcon.cs b/UIInfoSuite2/UIElements/ShowRobinBuildingStatusIcon.cs
@@ -62,7 +62,7 @@ private void OnDayStarted(object sender, DayStartedEventArgs e)
     private void OnRenderingHud(object sender, RenderingHudEventArgs e)
     {
       // Draw icon
-      if (!Game1.eventUp && _IsBuildingInProgress && _buildingIconSpriteLocation.HasValue)
+      if (UIElementUtils.IsRenderingNormally() && _IsBuildingInProgress && _buildingIconSpriteLocation.HasValue)
       {
         Point iconPosition = IconHandler.Handler.GetNewIconPosition();
         _buildingIcon.Value = new ClickableTextureComponent(

diff --git a/UIInfoSuite2/UIElements/ShowSeasonalBerry.cs b/UIInfoSuite2/UIElements/ShowSeasonalBerry.cs
@@ -7,122 +7,121 @@
 using UIInfoSuite2.Infrastructure;
 using UIInfoSuite2.Infrastructure.Extensions;
 
-namespace UIInfoSuite2.UIElements
+namespace UIInfoSuite2.UIElements;
+
+internal class ShowSeasonalBerry : IDisposable
 {
-  internal class ShowSeasonalBerry : IDisposable
+#region Logic
+  private void UpdateBerryForDay()
   {
-  #region Logic
-    private void UpdateBerryForDay()
+    string? season = Game1.currentSeason;
+    int day = Game1.dayOfMonth;
+    switch (season)
     {
-      string? season = Game1.currentSeason;
-      int day = Game1.dayOfMonth;
-      switch (season)
-      {
-        case "spring" when day is >= 15 and <= 18:
-          _berrySpriteLocation = new Rectangle(128, 193, 15, 15);
-          _hoverText = _helper.SafeGetString(LanguageKeys.CanFindSalmonberry);
-          _spriteScale = 8 / 3f;
-          break;
-        case "fall" when day is >= 8 and <= 11:
-          _berrySpriteLocation = new Rectangle(32, 272, 16, 16);
-          _hoverText = _helper.SafeGetString(LanguageKeys.CanFindBlackberry);
-          _spriteScale = 5 / 2f;
-          break;
-        case "fall" when day >= 15 && ShowHazelnut:
-          _berrySpriteLocation = new Rectangle(1, 274, 14, 14);
-          _hoverText = _helper.SafeGetString(LanguageKeys.CanFindHazelnut);
-          _spriteScale = 20 / 7f;
-          break;
-        default:
-          _berrySpriteLocation = null;
-          break;
-      }
+      case "spring" when day is >= 15 and <= 18:
+        _berrySpriteLocation = new Rectangle(128, 193, 15, 15);
+        _hoverText = _helper.SafeGetString(LanguageKeys.CanFindSalmonberry);
+        _spriteScale = 8 / 3f;
+        break;
+      case "fall" when day is >= 8 and <= 11:
+        _berrySpriteLocation = new Rectangle(32, 272, 16, 16);
+        _hoverText = _helper.SafeGetString(LanguageKeys.CanFindBlackberry);
+        _spriteScale = 5 / 2f;
+        break;
+      case "fall" when day >= 15 && ShowHazelnut:
+        _berrySpriteLocation = new Rectangle(1, 274, 14, 14);
+        _hoverText = _helper.SafeGetString(LanguageKeys.CanFindHazelnut);
+        _spriteScale = 20 / 7f;
+        break;
+      default:
+        _berrySpriteLocation = null;
+        break;
     }
-  #endregion
+  }
+#endregion
 
-  #region Properties
-    private Rectangle? _berrySpriteLocation;
-    private float _spriteScale = 8 / 3f;
-    private string _hoverText;
-    private ClickableTextureComponent _berryIcon;
+#region Properties
+  private Rectangle? _berrySpriteLocation;
+  private float _spriteScale = 8 / 3f;
+  private string _hoverText;
+  private ClickableTextureComponent _berryIcon;
 
-    private readonly IModHelper _helper;
+  private readonly IModHelper _helper;
 
-    private bool Enabled { get; set; }
-    private bool ShowHazelnut { get; set; }
-  #endregion
+  private bool Enabled { get; set; }
+  private bool ShowHazelnut { get; set; }
+#endregion
 
-  #region Lifecycle
-    public ShowSeasonalBerry(IModHelper helper)
-    {
-      _helper = helper;
-    }
+#region Lifecycle
+  public ShowSeasonalBerry(IModHelper helper)
+  {
+    _helper = helper;
+  }
 
-    public void Dispose()
-    {
-      ToggleOption(false);
-    }
+  public void Dispose()
+  {
+    ToggleOption(false);
+  }
 
-    public void ToggleOption(bool showSeasonalBerry)
-    {
-      Enabled = showSeasonalBerry;
+  public void ToggleOption(bool showSeasonalBerry)
+  {
+    Enabled = showSeasonalBerry;
 
-      _berrySpriteLocation = null;
-      _helper.Events.GameLoop.DayStarted -= OnDayStarted;
-      _helper.Events.Display.RenderingHud -= OnRenderingHud;
-      _helper.Events.Display.RenderedHud -= OnRenderedHud;
+    _berrySpriteLocation = null;
+    _helper.Events.GameLoop.DayStarted -= OnDayStarted;
+    _helper.Events.Display.RenderingHud -= OnRenderingHud;
+    _helper.Events.Display.RenderedHud -= OnRenderedHud;
 
-      if (showSeasonalBerry)
-      {
-        UpdateBerryForDay();
+    if (showSeasonalBerry)
+    {
+      UpdateBerryForDay();
 
-        _helper.Events.GameLoop.DayStarted += OnDayStarted;
-        _helper.Events.Display.RenderingHud += OnRenderingHud;
-        _helper.Events.Display.RenderedHud += OnRenderedHud;
-      }
+      _helper.Events.GameLoop.DayStarted += OnDayStarted;
+      _helper.Events.Display.RenderingHud += OnRenderingHud;
+      _helper.Events.Display.RenderedHud += OnRenderedHud;
     }
+  }
 
-    public void ToggleHazelnutOption(bool showHazelnut)
-    {
-      ShowHazelnut = showHazelnut;
-      ToggleOption(Enabled);
-    }
-  #endregion
+  public void ToggleHazelnutOption(bool showHazelnut)
+  {
+    ShowHazelnut = showHazelnut;
+    ToggleOption(Enabled);
+  }
+#endregion
 
-  #region Event subscriptions
-    private void OnDayStarted(object sender, DayStartedEventArgs e)
-    {
-      UpdateBerryForDay();
-    }
+#region Event subscriptions
+  private void OnDayStarted(object sender, DayStartedEventArgs e)
+  {
+    UpdateBerryForDay();
+  }
 
-    private void OnRenderingHud(object sender, RenderingHudEventArgs e)
+  private void OnRenderingHud(object sender, RenderingHudEventArgs e)
+  {
+    // Draw icon
+    if (!UIElementUtils.IsRenderingNormally() || !_berrySpriteLocation.HasValue)
     {
-      // Draw icon
-      if (Game1.eventUp || !_berrySpriteLocation.HasValue)
-      {
-        return;
-      }
-
-      Point iconPosition = IconHandler.Handler.GetNewIconPosition();
-      _berryIcon = new ClickableTextureComponent(
-        new Rectangle(iconPosition.X, iconPosition.Y, 40, 40),
-        Game1.objectSpriteSheet,
-        _berrySpriteLocation.Value,
-        _spriteScale
-      );
-      _berryIcon.draw(Game1.spriteBatch);
+      return;
     }
 
-    private void OnRenderedHud(object sender, RenderedHudEventArgs e)
+    Point iconPosition = IconHandler.Handler.GetNewIconPosition();
+    _berryIcon = new ClickableTextureComponent(
+      new Rectangle(iconPosition.X, iconPosition.Y, 40, 40),
+      Game1.objectSpriteSheet,
+      _berrySpriteLocation.Value,
+      _spriteScale
+    );
+    _berryIcon.draw(Game1.spriteBatch);
+  }
+
+  private void OnRenderedHud(object sender, RenderedHudEventArgs e)
+  {
+    // Show text on hover
+    bool hasMouse = _berryIcon?.containsPoint(Game1.getMouseX(), Game1.getMouseY()) ?? false;
+    bool hasText = !string.IsNullOrEmpty(_hoverText);
+    if (_berrySpriteLocation.HasValue && hasMouse && hasText)
     {
-      // Show text on hover
-      bool hasMouse = _berryIcon?.containsPoint(Game1.getMouseX(), Game1.getMouseY()) ?? false;
-      bool hasText = !string.IsNullOrEmpty(_hoverText);
-      if (_berrySpriteLocation.HasValue && hasMouse && hasText)
-      {
-        IClickableMenu.drawHoverText(Game1.spriteBatch, _hoverText, Game1.dialogueFont);
-      }
+      IClickableMenu.drawHoverText(Game1.spriteBatch, _hoverText, Game1.dialogueFont);
     }
-  #endregion
   }
+#endregion
 }
diff --git a/UIInfoSuite2/UIElements/ShowToolUpgradeStatus.cs b/UIInfoSuite2/UIElements/ShowToolUpgradeStatus.cs
@@ -118,7 +118,7 @@ private void OnDayStarted(object sender, DayStartedEventArgs e)
     private void OnRenderingHud(object sender, RenderingHudEventArgs e)
     {
       // Draw a 40x40 icon
-      if (!Game1.eventUp && _toolBeingUpgraded.Value != null)
+      if (UIElementUtils.IsRenderingNormally() && _toolBeingUpgraded.Value != null)
       {
         Point iconPosition = IconHandler.Handler.GetNewIconPosition();
         _toolUpgradeIcon.Value = new ClickableTextureComponent(

diff --git a/UIInfoSuite2/UIElements/ShowTravelingMerchant.cs b/UIInfoSuite2/UIElements/ShowTravelingMerchant.cs
@@ -80,7 +80,7 @@ private void OnMenuChanged(object sender, MenuChangedEventArgs e)
     private void OnRenderingHud(object sender, RenderingHudEventArgs e)
     {
       // Draw icon
-      if (!Game1.eventUp && ShouldDrawIcon())
+      if (UIElementUtils.IsRenderingNormally() && ShouldDrawIcon())
       {
         Point iconPosition = IconHandler.Handler.GetNewIconPosition();
         _travelingMerchantIcon = new ClickableTextureComponent(
-Original file line number
+Diff line change
@@ Expand Up @@
         private void OnRenderingHud(object sender, RenderingHudEventArgs e)
         {
-          if (Game1.eventUp)
+          if (!UIElementUtils.IsRenderingNormally())
           {
             return;
           }
@@ Expand Down @@