Merge pull request #941 from FFXIV-CombatReborn/Rotationcleanup

Cleaned up a lot of UI code with consideration for 3rd party rotations

Author: LTS-FFXIV

RotationSolver.Basic/Attributes/ApiAttribute.cs

@@ -1,9 +1,9 @@
 namespace RotationSolver.Basic.Attributes;
 
 /// <summary>
-/// To tag the rotations that are in beta version.
+/// Tag for rotations that are 3rd party (Extra).
 /// </summary>
 [AttributeUsage(AttributeTargets.Class)]
-public class BetaRotationAttribute : Attribute
+public class ExtraRotationAttribute : Attribute
 {
 }

RotationSolver.Basic/Attributes/BetaRotationAttribute.cs renamed to RotationSolver.Basic/Attributes/ExtraRotationAttribute.cs

@@ -22,7 +22,6 @@ internal class Service : IDisposable
     public const string ALTCOMMAND = "/rsr";
     public const string USERNAME = "FFXIV-CombatReborn";
     public const string REPO = "RotationSolverReborn";
-    public const int ApiVersion = 6;
 
     [EzHook("40 53 55 56 57 48 81 EC ?? ?? ?? ?? 0F 29 B4 24 ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 0F B6 AC 24 ?? ?? ?? ?? 0F 28 F3 49 8B F8", nameof(ActorVfxCreateDetour), true)]
     private readonly EzHook<ActorVfxCreateDelegate2> actorVfxCreateHook = null!;

RotationSolver.Basic/Attributes/LinkDescriptionAttribute.cs

@@ -46,9 +46,6 @@ internal enum UiString
         [Description("Invalid Rotation! \nPlease update to the latest version or contact {0}!")]
         ConfigWindow_Rotation_InvalidRotation,
 
-        [Description("Beta Rotation!")]
-        ConfigWindow_Rotation_BetaRotation,
-
         [Description("Click to switch rotations")]
         ConfigWindow_Helper_SwitchRotation,
 
@@ -115,9 +112,6 @@ internal enum UiString
         [Description("Duty Configuration")]
         ConfigWindow_DutyRotation_Configuration,
 
-        [Description("Information")]
-        ConfigWindow_Rotation_Information,
-
         [Description("Status")]
         ConfigWindow_Rotation_Status,
 

RotationSolver.Basic/Service.cs

@@ -6,29 +6,11 @@ namespace RotationSolver.Helpers;
 
 internal static class RotationHelper
 {
-    private static readonly Dictionary<Assembly, AssemblyInfo> _assemblyInfos = [];
-    private static readonly Dictionary<ICustomRotation, bool> _betaInfo = [];
+    private static readonly Dictionary<ICustomRotation, bool> _extraRotation = [];
     private static readonly Dictionary<ICustomRotation, RotationAttribute> _rotationAttributes = [];
 
     public static List<LoadedAssembly> LoadedCustomRotations { get; } = [];
 
-    public static AssemblyInfo GetInfo(this Assembly assembly)
-    {
-        if (_assemblyInfos.TryGetValue(assembly, out AssemblyInfo? info))
-        {
-            return info;
-        }
-
-        string? name = assembly.GetName().Name;
-        string location = assembly.Location;
-        string? company = assembly.GetCustomAttribute<AssemblyCompanyAttribute>()?.Company;
-        AssemblyInfo assemblyInfo = new(name, company, location, string.Empty, company, name, DateTime.Now);
-
-        _assemblyInfos[assembly] = assemblyInfo;
-
-        return assemblyInfo;
-    }
-
     public static unsafe Vector4 GetColor(this ICustomRotation rotation)
     {
         if (!rotation.IsEnabled)
@@ -41,19 +23,24 @@ public static unsafe Vector4 GetColor(this ICustomRotation rotation)
             return ImGuiColors.DPSRed;
         }
 
-        return rotation.IsBeta() ? ImGuiColors.DalamudOrange : ImGuiColors.DalamudWhite;
+        if (rotation.IsExtra())
+        {
+            return ImGuiColors.DalamudViolet;
+        }
+
+        return ImGuiColors.DalamudWhite;
     }
 
-    public static bool IsBeta(this ICustomRotation rotation)
+    public static bool IsExtra(this ICustomRotation rotation)
     {
-        if (_betaInfo.TryGetValue(rotation, out bool isBeta))
+        if (_extraRotation.TryGetValue(rotation, out bool isExtra))
         {
-            return isBeta;
+            return isExtra;
         }
 
-        BetaRotationAttribute? betaAttribute = rotation.GetType().GetCustomAttribute<BetaRotationAttribute>();
-        _betaInfo[rotation] = betaAttribute != null;
-        return _betaInfo[rotation];
+        ExtraRotationAttribute? extraRotationAttribute = rotation.GetType().GetCustomAttribute<ExtraRotationAttribute>();
+        _extraRotation[rotation] = extraRotationAttribute != null;
+        return _extraRotation[rotation];
     }
 
     public static RotationAttribute? GetAttributes(this ICustomRotation rotation)
@@ -71,55 +58,6 @@ public static bool IsBeta(this ICustomRotation rotation)
         return attributes;
     }
 
-    public static Assembly LoadCustomRotationAssembly(string filePath)
-    {
-        DirectoryInfo? directoryInfo = new FileInfo(filePath).Directory;
-        RotationLoadContext loadContext = new(directoryInfo);
-        Assembly assembly = loadContext.LoadFromFile(filePath);
-
-        string? assemblyName = assembly.GetName().Name;
-        string author = GetAuthor(filePath, assemblyName);
-
-        AssemblyLinkAttribute? link = assembly.GetCustomAttribute<AssemblyLinkAttribute>();
-        AssemblyInfo assemblyInfo = new(
-            assemblyName,
-            author,
-            filePath,
-            link?.Donate,
-            link?.UserName,
-            link?.Repository,
-            DateTime.Now);
-
-        Assembly? existingAssembly = GetAssemblyFromPath(filePath);
-        if (existingAssembly != null)
-        {
-            _ = _assemblyInfos.Remove(existingAssembly);
-        }
-
-        _assemblyInfos[assembly] = assemblyInfo;
-
-        LoadedAssembly loadedAssembly = new(
-            filePath,
-            File.GetLastWriteTimeUtc(filePath).ToString());
-
-        _ = LoadedCustomRotations.RemoveAll(item => item.FilePath == loadedAssembly.FilePath);
-        LoadedCustomRotations.Add(loadedAssembly);
-
-        return assembly;
-    }
-
-    private static Assembly? GetAssemblyFromPath(string filePath)
-    {
-        foreach (KeyValuePair<Assembly, AssemblyInfo> asm in _assemblyInfos)
-        {
-            if (asm.Value.FilePath == filePath)
-            {
-                return asm.Key;
-            }
-        }
-        return null;
-    }
-
     private static string GetAuthor(string filePath, string? assemblyName)
     {
         FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(filePath);

RotationSolver/Data/UiString.cs

@@ -4,7 +4,7 @@ namespace RotationSolver.RebornRotations.Healer;
 
 [Rotation("Reborn", CombatType.PvE, GameVersion = "7.3")]
 [SourceCode(Path = "main/RebornRotations/Healer/AST_Reborn.cs")]
-[Api(6)]
+
 public sealed class AST_Reborn : AstrologianRotation
 {
     #region Config Options

RotationSolver/Helpers/RotationHelper.cs

@@ -4,7 +4,7 @@ namespace RotationSolver.RebornRotations.Healer;
 
 [Rotation("Reborn", CombatType.PvE, GameVersion = "7.3")]
 [SourceCode(Path = "main/RebornRotations/Healer/SCH_Reborn.cs")]
-[Api(6)]
+
 public sealed class SCH_Reborn : ScholarRotation
 {
     #region Config Options

RotationSolver/Helpers/RotationLoadContext.cs

@@ -2,7 +2,7 @@ namespace RotationSolver.RebornRotations.Healer;
 
 [Rotation("Reborn", CombatType.PvE, GameVersion = "7.3")]
 [SourceCode(Path = "main/RebornRotations/Healer/SGE_Reborn.cs")]
-[Api(6)]
+
 public sealed class SGE_Reborn : SageRotation
 {
     #region Config Options