Merge branch 'refs/heads/main' into SMN_Updates

Nik-Potokar · Jul 5, 2024 · 37d845a · 37d845a
2 parents 78ee0a9 + 7da115b
commit 37d845a
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 96 deletions.
diff --git a/ECommons b/ECommons
diff --git a/.../Attributes/SecretCustomComboAttribute.cs → ...mbo/Attributes/PvPCustomComboAttribute.cs b/.../Attributes/SecretCustomComboAttribute.cs → ...mbo/Attributes/PvPCustomComboAttribute.cs
@@ -4,7 +4,7 @@ namespace XIVSlothCombo.Attributes
 {
     /// <summary> Attribute designating secret combos. </summary>
     [AttributeUsage(AttributeTargets.Field)]
-    internal class SecretCustomComboAttribute : Attribute
+    internal class PvPCustomComboAttribute : Attribute
     {
     }
 }
diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs
diff --git a/XIVSlothCombo/Core/Presets.cs b/XIVSlothCombo/Core/Presets.cs
@@ -10,7 +10,7 @@ namespace XIVSlothCombo.Core
 {
     internal static class PresetStorage
     {
-        private static HashSet<CustomComboPreset>? SecretCombos;
+        private static HashSet<CustomComboPreset>? PvPCombos;
         private static HashSet<CustomComboPreset>? VariantCombos;
         private static HashSet<CustomComboPreset>? BozjaCombos;
         private static HashSet<CustomComboPreset>? EurekaCombos;
@@ -20,8 +20,8 @@ internal static class PresetStorage
         public static void Init()
         {
             // Secret combos
-            SecretCombos = Enum.GetValues<CustomComboPreset>()
-                .Where(preset => preset.GetAttribute<SecretCustomComboAttribute>() != default)
+            PvPCombos = Enum.GetValues<CustomComboPreset>()
+                .Where(preset => preset.GetAttribute<PvPCustomComboAttribute>() != default)
                 .ToHashSet();
 
             VariantCombos = Enum.GetValues<CustomComboPreset>()
@@ -58,7 +58,7 @@ public static void Init()
         /// <summary> Gets a value indicating whether a preset is secret. </summary>
         /// <param name="preset"> Preset to check. </param>
         /// <returns> The boolean representation. </returns>
-        public static bool IsSecret(CustomComboPreset preset) => SecretCombos.Contains(preset);
+        public static bool IsPvP(CustomComboPreset preset) => PvPCombos.Contains(preset);
 
         /// <summary> Gets a value indicating whether a preset is secret. </summary>
         /// <param name="preset"> Preset to check. </param>

diff --git a/XIVSlothCombo/CustomCombo/Functions/Target.cs b/XIVSlothCombo/CustomCombo/Functions/Target.cs
@@ -4,6 +4,8 @@
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.Types;
+using ECommons.DalamudServices;
+using FFXIVClientStructs.FFXIV.Client.System.Framework;
 using XIVSlothCombo.Data;
 using XIVSlothCombo.Services;
 using StructsObject = FFXIVClientStructs.FFXIV.Client.Game.Object;
@@ -129,7 +131,7 @@ public static bool HasFriendlyTarget(IGameObject? OurTarget = null)
             //if (checkMO && HasFriendlyTarget(tm.MouseOverTarget)) healTarget = tm.MouseOverTarget;
             if (checkMOPartyUI)
             {
-                StructsObject.GameObject* t = PartyTargetingService.UITarget;
+                StructsObject.GameObject* t = Framework.Instance()->GetUIModule()->GetPronounModule()->UiMouseOverTarget;
                 if (t != null && t->GetGameObjectId().ObjectId != 0)
                 {
                     IGameObject? uiTarget =  Service.ObjectTable.Where(x => x.GameObjectId == t->GetGameObjectId().ObjectId).FirstOrDefault();

diff --git a/XIVSlothCombo/Services/PartyTargetingService.cs b/XIVSlothCombo/Services/PartyTargetingService.cs
@@ -16,9 +16,6 @@ public static ulong GetObjectID(GameObject* o)
             return id.ObjectId;
         }
 
-        private static readonly delegate* unmanaged<long, GameObject*> getGameObjectFromObjectID = (delegate* unmanaged<long, GameObject*>)Service.SigScanner.ScanText("E8 ?? ?? ?? ?? 44 0F B6 C3 48 8B D0");
-        public static GameObject* GetGameObjectFromObjectID(long id) => getGameObjectFromObjectID(id);
-
         private static readonly delegate* unmanaged<IntPtr, uint, GameObject*> getGameObjectFromPronounID = (delegate* unmanaged<IntPtr, uint, GameObject*>)Service.SigScanner.ScanText("E8 ?? ?? ?? ?? 48 8B D8 48 85 C0 0F 85 ?? ?? ?? ?? 8D 4F DD");
         public static GameObject* GetGameObjectFromPronounID(uint id) => getGameObjectFromPronounID(pronounModule, id);
     }

diff --git a/XIVSlothCombo/Window/Functions/Presets.cs b/XIVSlothCombo/Window/Functions/Presets.cs
@@ -21,7 +21,7 @@ internal class Presets : ConfigWindow
         internal unsafe static void DrawPreset(CustomComboPreset preset, CustomComboInfoAttribute info, ref int i)
         {
             var enabled = PresetStorage.IsEnabled(preset);
-            var secret = PresetStorage.IsSecret(preset);
+            var secret = PresetStorage.IsPvP(preset);
             var conflicts = PresetStorage.GetConflicts(preset);
             var parent = PresetStorage.GetParent(preset);
             var blueAttr = preset.GetAttribute<BlueInactiveAttribute>();

diff --git a/XIVSlothCombo/Window/Tabs/PvEFeatures.cs b/XIVSlothCombo/Window/Tabs/PvEFeatures.cs
@@ -154,7 +154,7 @@ internal static void DrawHeadingContents(string jobName, int i)
         {
             if (!Messages.PrintBLUMessage(jobName)) return;
 
-            foreach (var (preset, info) in groupedPresets[jobName].Where(x => !PresetStorage.IsSecret(x.Preset) &&
+            foreach (var (preset, info) in groupedPresets[jobName].Where(x => !PresetStorage.IsPvP(x.Preset) &&
                                                                                 !PresetStorage.IsVariant(x.Preset) &&
                                                                                 !PresetStorage.IsBozja(x.Preset) &&
                                                                                 !PresetStorage.IsEureka(x.Preset)))

diff --git a/XIVSlothCombo/Window/Tabs/PvPFeatures.cs b/XIVSlothCombo/Window/Tabs/PvPFeatures.cs
@@ -47,7 +47,7 @@ internal class PvPFeatures : ConfigWindow
                     });
                     ImGui.Spacing();
 
-                    foreach (string? jobName in groupedPresets.Keys)
+                    foreach (string? jobName in groupedPresets.Where(x => x.Value.Any(y => PresetStorage.IsPvP(y.Preset))).Select(x => x.Key))
                     {
                         string abbreviation = groupedPresets[jobName].First().Info.JobShorthand;
                         string header = string.IsNullOrEmpty(abbreviation) ? jobName : $"{jobName} - {abbreviation}";
@@ -118,7 +118,7 @@ internal class PvPFeatures : ConfigWindow
 
         private static void DrawHeadingContents(string jobName, int i)
         {
-            foreach (var (preset, info) in groupedPresets[jobName].Where(x => PresetStorage.IsSecret(x.Preset)))
+            foreach (var (preset, info) in groupedPresets[jobName].Where(x => PresetStorage.IsPvP(x.Preset)))
             {
                 InfoBox presetBox = new() { Color = Colors.Grey, BorderThickness = 1f, CurveRadius = 8f, ContentsAction = () => { Presets.DrawPreset(preset, info, ref i); } };
 

diff --git a/XIVSlothCombo/XIVSlothCombo.cs b/XIVSlothCombo/XIVSlothCombo.cs
@@ -70,27 +70,27 @@ public sealed partial class XIVSlothCombo : IDalamudPlugin
         public static readonly List<uint> DisabledJobsPVP = new List<uint>()
         {
             //ADV.JobID,
-            AST.JobID,
-            BLM.JobID,
+            //AST.JobID,
+            //BLM.JobID,
             //BLU.JobID,
-            BRD.JobID,
-            DNC.JobID,
-            DOL.JobID,
-            DRG.JobID,
-            DRK.JobID,
-            GNB.JobID,
-            MCH.JobID,
-            MNK.JobID,
-            NIN.JobID,
-            PLD.JobID,
-            RDM.JobID,
-            RPR.JobID,
-            SAM.JobID,
-            SCH.JobID,
-            SGE.JobID,
-            SMN.JobID,
-            WAR.JobID,
-            WHM.JobID
+            //BRD.JobID,
+            //DNC.JobID,
+            //DOL.JobID,
+            //DRG.JobID,
+            //DRK.JobID,
+            //GNB.JobID,
+            //MCH.JobID,
+            //MNK.JobID,
+            //NIN.JobID,
+            //PLD.JobID,
+            //RDM.JobID,
+            //RPR.JobID,
+            //SAM.JobID,
+            //SCH.JobID,
+            //SGE.JobID,
+            //SMN.JobID,
+            //WAR.JobID,
+            //WHM.JobID
         };
 
         public static uint? JobID
+2 −2		ECommons/UIHelpers/AddonFinder.cs
+1 −0		ECommons/UIHelpers/AddonMasterImplementations/!AddonMaster.cs
+10 −0		ECommons/UIHelpers/AddonMasterImplementations/!AddonMasterBase.cs
+1 −4		ECommons/UIHelpers/AddonMasterImplementations/GrandCompanySupplyReward.cs
+1 −8		ECommons/UIHelpers/AddonMasterImplementations/MaterializeDialog.cs
+30 −0		ECommons/UIHelpers/AddonMasterImplementations/RecipeNote.cs
+1 −8		ECommons/UIHelpers/AddonMasterImplementations/Repair.cs
+3 −10		ECommons/UIHelpers/AddonMasterImplementations/Request.cs
+19 −15		ECommons/UIHelpers/AddonMasterImplementations/RetainerList.cs
+2 −16		ECommons/UIHelpers/AddonMasterImplementations/SelectYesno.cs
+1 −6		ECommons/UIHelpers/AddonMasterImplementations/Talk.cs
+30 −0		ECommons/UIHelpers/AtkEventDataBuilder.cs
+2 −0		ECommons/UIHelpers/AtkReader.cs
+1 −1		ECommons/UIHelpers/AtkReaderImplementations/ReaderRetainerList.cs