Merge pull request #804 from FFXIV-CombatReborn/ShakeABranch

Update WAR and enhance Dalamud branch caching

Author: LTS-FFXIV

BasicRotations/Tank/WAR_Default.cs

@@ -182,7 +182,7 @@ protected override bool HealSingleAbility(IAction nextGCD, out IAction? act)
     {
         if (ShakeItOffPvE.CanUse(out act, skipAoeCheck: true))
         {
-            return false;
+            return true;
         }
 
         return base.HealSingleAbility(nextGCD, out act);

RotationSolver.Basic/Actions/ActionTargetInfo.cs

@@ -5,7 +5,6 @@
 using ECommons.GameHelpers;
 using ECommons.Logging;
 using FFXIVClientStructs.FFXIV.Client.Game;
-using FFXIVClientStructs.FFXIV.Client.Game.Event;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using RotationSolver.Basic.Configuration;

RotationSolver.Basic/Rotations/Duties/PhantomRotation.cs

@@ -49,6 +49,7 @@ public virtual void DisplayStatus()
     private static readonly BaseItem OccultElixirItem = new(47743);
     private static readonly BaseItem OccultPotionItem = new(47741);
     #endregion
+
     #region Status Tracking
 
     /// <summary>
@@ -177,7 +178,6 @@ static partial void ModifyOccultCounterPvE(ref ActionSetting setting)
         setting.CreateConfig = () => new ActionConfig()
         {
             AoeCount = 1,
-            IsEnabled = false,
         };
     }
 

RotationSolver/Watcher.cs

@@ -29,50 +29,46 @@ public static void Disable()
     public static string ShowStrSelf { get; private set; } = string.Empty;
     public static string ShowStrEnemy { get; private set; } = string.Empty;
 
+    private static string? _cachedBranch = null;
+
     public static string DalamudBranch()
     {
+        if (_cachedBranch != null)
+            return _cachedBranch;
+
         const string stg = "stg";
         const string release = "release";
         const string other = "other";
+        string result = other;
 
         if (DalamudReflector.TryGetDalamudStartInfo(out Dalamud.Common.DalamudStartInfo? startinfo, Svc.PluginInterface))
         {
             if (File.Exists(startinfo.ConfigurationPath))
             {
                 try
                 {
-                    string file = File.ReadAllText(startinfo.ConfigurationPath);
-                    dynamic? ob = JsonConvert.DeserializeObject<dynamic>(file);
-                    string? type = ob?.DalamudBetaKind;
-                    if (type is not null && !string.IsNullOrEmpty(type))
+                    using var fs = File.OpenRead(startinfo.ConfigurationPath);
+                    using var doc = System.Text.Json.JsonDocument.Parse(fs);
+                    if (doc.RootElement.TryGetProperty("DalamudBetaKind", out var kindProp))
                     {
-                        return type switch
+                        string? type = kindProp.GetString();
+                        result = type switch
                         {
                             "stg" => stg,
                             "release" => release,
                             _ => other,
                         };
                     }
-                    else
-                    {
-                        PluginLog.Information("Dalamud release is not a string or null.");
-                        return other;
-                    }
                 }
-                catch (Exception ex)
+                catch
                 {
-                    PluginLog.Information($"Failed to read or deserialize configuration file: {ex.Message}");
-                    return other;
+                    result = other;
                 }
             }
-            else
-            {
-                PluginLog.Information("Configuration file does not exist.");
-                return other;
-            }
         }
-        PluginLog.Information("Failed to get Dalamud start info.");
-        return other;
+
+        _cachedBranch = result;
+        return result;
     }
 
     private static void ActionFromEnemy(ActionEffectSet set)