Fix: Core: folder typo

Core: BlacklistSourceType added to keep track of references Core: GoalFactory: Add default IBlacklist implementation to be a fallback to TARGET based.
Xian55 · Jan 12, 2025 · 5e622bd · 5e622bd
1 parent 631b1ab
commit 5e622bd
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 11 deletions.
diff --git a/Core/Goals/ApproachTargetGoal.cs b/Core/Goals/ApproachTargetGoal.cs
@@ -45,7 +45,7 @@ public ApproachTargetGoal(ILogger<ApproachTargetGoal> logger,
         ConfigurableInput input, Wait wait,
         PlayerReader playerReader, AddonBits addonBits,
         StopMoving stopMoving, CombatUtil combatUtil,
-        [FromKeyedServices("target")] IBlacklist blacklist,
+        IBlacklist blacklist,
         IMountHandler mountHandler)
         : base(nameof(ApproachTargetGoal))
     {

diff --git a/Core/Goals/BlacklistTargetGoal.cs b/Core/Goals/BlacklistTargetGoal.cs
@@ -15,7 +15,7 @@ public sealed class BlacklistTargetGoal : GoapGoal
     public BlacklistTargetGoal(PlayerReader playerReader,
         AddonBits bits,
         ConfigurableInput input,
-        [FromKeyedServices("target")] IBlacklist blacklist,
+        IBlacklist blacklist,
         Wait wait)
         : base(nameof(BlacklistTargetGoal))
     {

diff --git a/Core/Goals/FollowRouteGoal.cs b/Core/Goals/FollowRouteGoal.cs
@@ -86,7 +86,7 @@ public FollowRouteGoal(
         ClassConfiguration classConfig,
         Navigation navigation,
         IMountHandler mountHandler, TargetFinder targetFinder,
-        [FromKeyedServices("target")] IBlacklist targetBlacklist)
+        IBlacklist targetBlacklist)
     : base("Follow " + System.IO.Path.GetFileNameWithoutExtension(pathSettings.FileName))
     {
         this.cost = cost;

diff --git a/Core/Goals/PullTargetGoal.cs b/Core/Goals/PullTargetGoal.cs
@@ -42,7 +42,7 @@ public sealed class PullTargetGoal : GoapGoal, IGoapEventListener
     public PullTargetGoal(ILogger<PullTargetGoal> logger, ConfigurableInput input,
         Wait wait, CombatLog combatlog, PlayerReader playerReader,
         AddonBits bits,
-        [FromKeyedServices("target")] IBlacklist targetBlacklist,
+        IBlacklist targetBlacklist,
         StopMoving stopMoving, CastingHandler castingHandler,
         IMountHandler mountHandler, NpcNameTargeting npcNameTargeting,
         StuckDetector stuckDetector, CombatUtil combatUtil,

diff --git a/...list/BlaclistSource/BlacklistMouseOver.cs → ...ist/BlacklistSource/BlacklistMouseOver.cs b/...list/BlaclistSource/BlacklistMouseOver.cs → ...ist/BlacklistSource/BlacklistMouseOver.cs
diff --git a/Core/GoalsComponent/Blacklist/BlacklistSource/BlacklistSourceType.cs b/Core/GoalsComponent/Blacklist/BlacklistSource/BlacklistSourceType.cs
@@ -0,0 +1,7 @@
+namespace Core;
+
+public static class BlacklistSourceType
+{
+    public const string MOUSE_OVER = "mouseOver";
+    public const string TARGET = "target";
+}
diff --git a/...acklist/BlaclistSource/BlacklistTarget.cs → ...cklist/BlacklistSource/BlacklistTarget.cs b/...acklist/BlaclistSource/BlacklistTarget.cs → ...cklist/BlacklistSource/BlacklistTarget.cs
diff --git a/...cklist/BlaclistSource/IBlacklistSource.cs → ...klist/BlacklistSource/IBlacklistSource.cs b/...cklist/BlaclistSource/IBlacklistSource.cs → ...klist/BlacklistSource/IBlacklistSource.cs
diff --git a/Core/GoalsComponent/MountHandler.cs b/Core/GoalsComponent/MountHandler.cs
@@ -31,7 +31,7 @@ public MountHandler(ILogger<MountHandler> logger, ConfigurableInput input,
         PlayerReader playerReader, ActionBarBits<IUsableAction> usableAction,
         ActionBarCooldownReader cooldownReader,
         StopMoving stopMoving,
-        [FromKeyedServices("target")] IBlacklist targetBlacklist)
+        IBlacklist targetBlacklist)
     {
         this.logger = logger;
         this.classConfig = classConfig;

diff --git a/Core/GoalsComponent/NpcNameTargeting.cs b/Core/GoalsComponent/NpcNameTargeting.cs
@@ -9,6 +9,8 @@
 using System.Runtime.CompilerServices;
 using Microsoft.Extensions.DependencyInjection;
 
+using static Core.BlacklistSourceType;
+
 namespace Core.Goals;
 
 public sealed partial class NpcNameTargeting : IDisposable
@@ -44,7 +46,7 @@ public NpcNameTargeting(ILogger<NpcNameTargeting> logger,
         NpcNameTargetingLocations locations,
         IMouseInput input,
         IMouseOverReader mouseOverReader,
-        [FromKeyedServices("mouseOver")] IBlacklist mouseOverBlacklist,
+        [FromKeyedServices(MOUSE_OVER)] IBlacklist mouseOverBlacklist,
         Wait wait,
         IGameMenuWindowShown gmws)
     {

diff --git a/Core/GoalsFactory/GoalFactory.cs b/Core/GoalsFactory/GoalFactory.cs
@@ -12,6 +12,8 @@
 using SharedLib;
 using Core.Database;
 
+using static Core.BlacklistSourceType;
+
 namespace Core;
 
 public static class GoalFactory
@@ -40,8 +42,8 @@ public static IServiceProvider Create(
         {
             services.AddScoped<IBlacklist, NoBlacklist>();
 
-            services.AddKeyedScoped<IBlacklist, NoBlacklist>("target");
-            services.AddKeyedScoped<IBlacklist, NoBlacklist>("mouseOver");
+            services.AddKeyedScoped<IBlacklist, NoBlacklist>(TARGET);
+            services.AddKeyedScoped<IBlacklist, NoBlacklist>(MOUSE_OVER);
         }
         else
         {
@@ -51,8 +53,10 @@ public static IServiceProvider Create(
             services.AddScoped<BlacklistMouseOver>();
             services.AddScoped<BlacklistTarget>();
 
-            services.AddKeyedScoped<IBlacklist, Blacklist<BlacklistMouseOver>>("mouseOver");
-            services.AddKeyedScoped<IBlacklist, Blacklist<BlacklistTarget>>("target");
+            services.AddKeyedScoped<IBlacklist, Blacklist<BlacklistMouseOver>>(MOUSE_OVER);
+            services.AddKeyedScoped<IBlacklist, Blacklist<BlacklistTarget>>(TARGET);
+
+            services.AddScoped<IBlacklist>(x => x.GetRequiredKeyedService<IBlacklist>(TARGET));
 
             services.AddScoped<GoapGoal, BlacklistTargetGoal>();
         }
@@ -298,7 +302,7 @@ public static void ResolveFollowRouteGoal(IServiceCollection services,
                 x.GetRequiredService<Navigation>(),
                 x.GetRequiredService<IMountHandler>(),
                 x.GetRequiredService<TargetFinder>(),
-                x.GetRequiredKeyedService<IBlacklist>("target")
+                x.GetRequiredService<IBlacklist>()
                 ));
         }
     }