Merge pull request #195 from Xian55/refactor/linq

Refactor: Get rid of linq from Core
Xian55 · Dec 21, 2021 · 805615d · 805615d
2 parents 68e2e04 + 0d8cbfd
commit 805615d
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 49 deletions.
diff --git a/Core/Actionbar/ActionBarPopulator.cs b/Core/Actionbar/ActionBarPopulator.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Core
@@ -57,7 +56,7 @@ private void CollectKeyActions()
         private void AddUnique(KeyAction a)
         {
             if (!KeyReader.KeyMapping.ContainsKey(a.Key)) return;
-            if (sources.Any(i => i.KeyAction.ConsoleKeyFormHash == a.ConsoleKeyFormHash)) return;
+            if (sources.FindIndex(i => i.KeyAction.ConsoleKeyFormHash == a.ConsoleKeyFormHash) > -1) return;
 
             var source = new ActionBarSource
             {

diff --git a/Core/Addon/AddonDataProvider/AddonDataProvider.cs b/Core/Addon/AddonDataProvider/AddonDataProvider.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Text;
 using SharedLib;
 using Game;
 

diff --git a/Core/Addon/EquipmentReader.cs b/Core/Addon/EquipmentReader.cs
@@ -1,6 +1,4 @@
-using System.Linq;
-
-namespace Core
+namespace Core
 {
     public enum InventorySlotId
     {
@@ -61,7 +59,7 @@ public void Read()
 
         public string ToStringList()
         {
-            return string.Join(", ", equipment.Where(i => i > 0));
+            return string.Join(", ", equipment);
         }
 
         public bool HasRanged()

diff --git a/Core/AddonComponent/CreatureHistory.cs b/Core/AddonComponent/CreatureHistory.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Collections.Generic;
 
 namespace Core

diff --git a/Core/Blacklist/NoBlacklist.cs b/Core/Blacklist/NoBlacklist.cs
@@ -1,10 +1,6 @@
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Core
+namespace Core
 {
-    public class NoBlacklist: IBlacklist
+    public class NoBlacklist : IBlacklist
     {
         public void Add(string name)
         {

diff --git a/Core/Database/WorldMapAreaDB.cs b/Core/Database/WorldMapAreaDB.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Numerics;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -52,7 +51,7 @@ public Vector3 GetWorldLocation(int uiMapId, Vector3 p, bool flipXY)
 
         public WorldMapAreaSpot ToMapAreaSpot(float x, float y, float z, string continent, int mapHint)
         {
-            var area = WorldMapAreaFactory.GetWorldMapArea(areas.Values.ToList(), x, y, continent, mapHint);
+            var area = WorldMapAreaFactory.GetWorldMapArea(new List<WorldMapArea>(areas.Values), x, y, continent, mapHint);
             return new WorldMapAreaSpot
             {
                 Y = area.ToMapX(x),

diff --git a/Core/Goals/CastingHandler.cs b/Core/Goals/CastingHandler.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Numerics;
 
@@ -369,7 +368,7 @@ public async ValueTask<bool> CastIfReady(KeyAction item, int sleepBeforeCast = 0
             }
             else
             {
-                if (item.RequirementObjects.Any())
+                if (item.RequirementObjects.Count > 0)
                 {
                     (bool firstReq, double firstReqElapsedMs) = await wait.InterruptTask(SpellQueueTimeMs,
                         () => !item.CanRun()
@@ -434,16 +433,15 @@ public async ValueTask<bool> SwitchToCorrectStanceForm(Form beforeForm, KeyActio
                 return true;
             }
 
-            var formKeyAction = classConfig.Form
-                .Where(s => s.FormEnum == item.FormEnum)
-                .FirstOrDefault();
-
-            if (formKeyAction == null)
+            int index = classConfig.Form.FindIndex(x => x.FormEnum == item.FormEnum);
+            if (index == -1)
             {
                 logger.LogWarning($"Unable to find key in Form to transform into {item.FormEnum}");
                 return false;
             }
 
+            KeyAction formKeyAction = classConfig.Form[index];
+
             await input.KeyPress(formKeyAction.ConsoleKey, formKeyAction.PressDuration);
             (bool notChanged, double elapsedMs) = await wait.InterruptTask(SpellQueueTimeMs, () => beforeForm != playerReader.Form);
             item.LogInformation($" ... form changed: {!notChanged} | Delay: {elapsedMs}ms");

diff --git a/Core/Goals/CombatGoal.cs b/Core/Goals/CombatGoal.cs
@@ -1,7 +1,6 @@
 using Core.GOAP;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using System.Threading.Tasks;

diff --git a/Core/Goals/CorpseRunGoal.cs b/Core/Goals/CorpseRunGoal.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Numerics;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using SharedLib.Extensions;
 
@@ -31,7 +30,7 @@ public CorpseRunGoal(PlayerReader playerReader, ConfigurableInput input, IPlayer
             this.input = input;
             this.playerDirection = playerDirection;
             this.stopMoving = stopMoving;
-            this.spiritWalkerPath = spiritWalker.ToList();
+            this.spiritWalkerPath = spiritWalker;
             this.logger = logger;
             this.stuckDetector = stuckDetector;
 
@@ -101,7 +100,7 @@ public override async ValueTask PerformAction()
 
             lastDistance = distance;
 
-            if (distance < 30 && points.Any())
+            if (distance < 30 && points.Count > 0)
             {
                 logger.LogInformation($"Move to next point");
                 points.Pop();

diff --git a/Core/Goals/GoalThread.cs b/Core/Goals/GoalThread.cs
@@ -49,7 +49,7 @@ public void OnActionEvent(object sender, ActionEventArgs e)
             }
             else if (e.Key == GoapKey.consumecorpse && (bool)e.Value == false)
             {
-                if (routeInfo != null && routeInfo.PoiList.Any())
+                if (routeInfo != null && routeInfo.PoiList.Count > 0)
                 {
                     var closest = routeInfo.PoiList.Where(p => p.Name == "Corpse").
                         Select(i => new { i, d = addonReader.PlayerReader.PlayerLocation.DistanceXYTo(i.Location) }).

diff --git a/Core/Goals/GoapGoal.cs b/Core/Goals/GoapGoal.cs
@@ -1,7 +1,6 @@
 using Core.GOAP;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -107,9 +106,7 @@ public void AddPrecondition(GoapKey key, object value)
 
         public void RemovePrecondition(GoapKey key)
         {
-            Preconditions.Where(o => o.Key.Equals(key))
-              .ToList()
-              .ForEach(o => Preconditions.Remove(o));
+            Preconditions.RemoveWhere(o => o.Key.Equals(key));
         }
 
         public void AddEffect(GoapKey key, object value)
@@ -119,9 +116,7 @@ public void AddEffect(GoapKey key, object value)
 
         public void RemoveEffect(GoapKey key)
         {
-            Effects.Where(o => o.Key.Equals(key))
-                .ToList()
-                .ForEach(o => Effects.Remove(o));
+            Effects.RemoveWhere(o => o.Key.Equals(key));
         }
 
         public virtual void OnActionEvent(object sender, ActionEventArgs e)
@@ -130,7 +125,7 @@ public virtual void OnActionEvent(object sender, ActionEventArgs e)
 
         public virtual string Description()
         {
-            return $"{Name} " + (Keys.Count == 1 ? $"[{Keys.First().ConsoleKey}]" : "");
+            return $"{Name} " + (Keys.Count == 1 ? $"[{Keys[0].ConsoleKey}]" : "");
         }
     }
 }
diff --git a/Core/Goals/MountHandler.cs b/Core/Goals/MountHandler.cs
@@ -1,7 +1,5 @@
 using Core.Goals;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Core
@@ -39,10 +37,11 @@ public async ValueTask MountUp()
 
             if (playerReader.Class == PlayerClassEnum.Druid)
             {
-                classConfig.Form
-                    .Where(s => s.FormEnum == Form.Druid_Travel)
-                    .ToList()
-                    .ForEach(async key => await castingHandler.SwitchToCorrectStanceForm(playerReader.Form, key));
+                int index = classConfig.Form.FindIndex(s => s.FormEnum == Form.Druid_Travel);
+                if (index > -1)
+                {
+                    await castingHandler.SwitchToCorrectStanceForm(playerReader.Form, classConfig.Form[index]);
+                }
             }
             else
             {
@@ -72,10 +71,11 @@ public async ValueTask Dismount()
         {
             if (playerReader.Class == PlayerClassEnum.Druid && playerReader.Form == Form.Druid_Travel)
             {
-                classConfig.Form
-                    .Where(s => s.FormEnum == Form.Druid_Travel)
-                    .ToList()
-                    .ForEach(async k => await input.KeyPress(k.ConsoleKey, 50));
+                int index = classConfig.Form.FindIndex(s => s.FormEnum == Form.Druid_Travel);
+                if (index > -1)
+                {
+                    await input.KeyPress(classConfig.Form[index].ConsoleKey, 50);
+                }
             }
             else
             {

diff --git a/Core/MiniMapNodeAlert/MinimapNodeFinder.cs b/Core/MiniMapNodeAlert/MinimapNodeFinder.cs
@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
-using SharedLib;
 using Game;
 
 #nullable enable