Merge branch 'main' into fuck-you-manual-mode

FFXIV-CombatReborn · Apr 14, 2024 · 62950d6 · 62950d6
2 parents 9c70e19 + 63b2ec7
commit 62950d6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/RotationSolver.Basic/Attributes/ApiAttribute.cs b/RotationSolver.Basic/Attributes/ApiAttribute.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RotationSolver.Basic.Attributes
+{
+    /// <summary>
+    /// Attribute to specify the version of the API that this rotation targets.
+    /// </summary>
+    public class ApiAttribute(int apiVersion) : Attribute
+    {
+        /// <summary>
+        /// The version of the API that this rotation targets.
+        /// </summary>
+        public int ApiVersion => apiVersion;
+    }
+}
diff --git a/RotationSolver.Basic/Service.cs b/RotationSolver.Basic/Service.cs
@@ -10,6 +10,7 @@ namespace RotationSolver.Basic;
 internal class Service : IDisposable
 {
     public const string COMMAND = "/rotation", USERNAME = "FFXIV-CombatReborn", REPO = "RotationSolverReborn";
+    public const int ApiVersion = 1;
 
     // From https://GitHub.com/PunishXIV/Orbwalker/blame/master/Orbwalker/Memory.cs#L85-L87
     [Signature("F3 0F 10 05 ?? ?? ?? ?? 0F 2E C6 0F 8A", ScanType = ScanType.StaticAddress, Fallibility = Fallibility.Infallible)]

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -386,7 +386,14 @@ private void DrawHeader(float wholeWidth)
         }
 
         var rotation = DataCenter.RightNowRotation;
-        if (rotation == null) return;
+        if (rotation == null)
+        {
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudOrange);
+            ImGui.TextWrapped("No rotations loaded! Was there recently a big update?");
+            ImGui.PopStyleColor();
+            ImguiTooltips.HoveredTooltip("Please update your rotations!");
+            return;
+        }
 
         var rotations = RotationUpdater.CustomRotations.FirstOrDefault(i => i.ClassJobIds.Contains((Job)(Player.Object?.ClassJob.Id ?? 0)))?.Rotations ?? [];
 

diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs
@@ -198,6 +198,7 @@ private static CustomRotationGroup[] LoadCustomRotationGroup(List<Assembly> asse
             {
                 if (type.GetInterfaces().Contains(typeof(ICustomRotation))
                     && !type.IsAbstract && !type.IsInterface && type.GetConstructor([]) != null)
+                    //&& type.GetCustomAttribute<ApiAttribute>()?.ApiVersion == Service.ApiVersion) //TODO: Check for API version
                 {
                     rotationList.Add(type);
                 }
@@ -539,6 +540,7 @@ private static void UpdateCustomRotation()
                 {
                     var rot = r.GetCustomAttribute<RotationAttribute>();
                     if (rot == null) return false;
+
                     var type = rot.Type;
 
                     return isPvP ? type.HasFlag(CombatType.PvP) : type.HasFlag(CombatType.PvE);